X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fbase_calendar%2Fbase_calendar_view.xml;h=164331b237262406615a627e333396309782cdd3;hb=11dd44ec360d4130c824bda10bd2bee1f8a31a2c;hp=bb0412a2247747c7a80054b8c8c13bd29cf3b70c;hpb=230340bbbf49eb148f2ce5396a9790023e4bc68d;p=odoo%2Fodoo.git

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index bb0412a..164331b 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,69 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!--        Attendee form view-->
+        <!-- Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invitation details">
-                    <group col="6" colspan="4">
-                        <field name="email" string="Invitation To"/>
-                        <field name="cutype" string="Invitation type" />
-                        <field name="rsvp" />
-                        <field name="role" string="Role" />
-                        <field name="sent_by_uid" string="Invitation From" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Invitation">
-                            <separator string="Invitation Detail" colspan="4" />
-                            <group colspan="4" col="4">
+                <form string="Invitation details" version="7.0">
+                    <header>
+                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
+                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
+                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
+                        <field name="state" widget="statusbar"
+                            statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
+                    </header>
+                    <sheet>
+
+                        <div class="oe_title">
+                            <label for="email" string="Invitation To" class="oe_edit_only" /> 
+                            <h1>
+                                <field name="email" class="oe_inline" />
+                                (<field name="language" class="oe_inline" />)
+                            </h1>
+                            
+                            <h2>
+                                From <field name="event_date" class="oe_inline" />
+                                to <field name="event_end_date" class="oe_inline"/>
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="sent_by_uid" string="Invitation From" />
                                 <field name="user_id" string="Invited User"/>
-                                <newline/>
-                                <field name="partner_address_id"
-                                    string="Contact" />
-                                <field name="partner_id"
-                                    string="Partner" readonly="1" />
+                                <field name="partner_id" string="Contact" />
                             </group>
-                            <separator string="Event Detail" colspan="4" />
-                            <group colspan="4" col="4">
-                                <field name="event_date" />
-                                <field name="event_end_date" />
-                                <field name="language"/>
-                                <field name="ref" colspan="4" readonly="1"/>
+                            <group>
+                                <field name="cutype" string="Invitation Type" />
+                                <field name="role" string="Role" />
+                                <field name="rsvp" />
+                                <field name="ref" readonly="1"/>
                             </group>
-                        </page>
-                        <page string="Delegation Info">
-                            <separator string="Delegated From" colspan="4" />
-                            <field name="parent_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                            <separator string="Delegated To" colspan="4" />
-                            <field name="child_ids" nolabel="1"
-                                colspan="4" readonly="1" />
-                        </page>
-                    </notebook>
-                    <group col="6" colspan="4">
-                            <field name="state" />
-                            <button name="do_tentative"
-                                states="needs-action,declined,accepted"
-                                string="Uncertain" type="object"
-                                icon="terp-crm" />
-                            <button name="do_accept" string="Accept"
-                                states="needs-action,tentative,declined"
-                                type="object" icon="gtk-apply" />
-                            <button name="do_decline" string="Decline"
-                                states="needs-action,tentative,accepted"
-                                type="object" icon="gtk-cancel" />
-                            <button
-                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                string="Delegate" type="action"
-                                icon="gtk-sort-descending"
-                                states="needs-action,tentative,declined,accepted"
-                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                    </group>
+                        </group>
+                        <group>
+                            <group string="Delegated From">
+                                <field name="parent_ids" readonly="1" nolabel="1" />
+                            </group>
+                            <group string="Delegated To" >
+                                <field name="child_ids" readonly="1" nolabel="1" />
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -76,13 +65,13 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-                    <field name="email" string="Invitation To"/>
-                    <field name="user_id" string="Internal User" />
-                    <field name="partner_address_id" string="Contact" />
-                    <field name="role" />
+                    <field name="sent_by_uid" string="Invitation From" />
+                    <field name="role" string="My Role"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="cutype" string="Invitation Type"/>
                     <field name="state" />
-                    <field name="cutype" invisible="1"/>
-                    <field name="rsvp" invisible="1"/>
+                    <field name="rsvp" string="Required to Join"/>
                 </tree>
             </field>
         </record>
@@ -95,32 +84,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <filter icon="terp-check" string="Accepted"
-                       domain="[('state','=', 'accepted')]"
-                       separator="1" help="Accepted Invitations" />
-                   <filter icon="terp-dialog-close" string="Declined"
-                       domain="[('state','=', 'declined')]"
-                       separator="1" help="Declined Invitations" />
-                   <separator orientation="vertical"/>
-                   <field name="email" select='1'/>
-                   <field name="user_id" select="1"/>
-                   <separator orientation="vertical"/>
-                   <field name="cutype" string="Invitation type" select="1"/>
-                   <field name="event_date" select="1"/>
-                   <newline/>
+                    <field name="email" string="Email"/>
+                    <field name="event_date"/>
+                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
+                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
+                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
+                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
+                    <field name="user_id" string="Responsible"/>
+                    <field name="cutype" string="Invitation type"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
-                            domain="[]" context="{'group_by':'cutype'}" />
-                        <filter string="Role" icon="terp-gtk-select-all"
-                            domain="[]" context="{'group_by':'role'}" />
-                        <filter string="Required Reply" icon="terp-mail-replied"
-                            domain="[]" context="{'group_by':'rsvp'}" />
-                        <separator orientation="vertical" />
-                        <filter string="User" icon="terp-personal" domain="[]"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
-                            context="{'group_by':'partner_address_id'}" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
+                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
+                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':'state'}" />
                     </group>
                </search>
@@ -137,13 +115,13 @@
          </record>
 
         <!-- Calenadar's menu -->
-          <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="15" />
+        <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
 
         <!-- Invitation menu -->
 
-           <menuitem id="menu_attendee_invitations"
-            name="Event Invitations" parent="base.menu_calendar_configuration"
+         <menuitem id="menu_attendee_invitations"
+            parent="base.menu_calendar_configuration"
             sequence="10" action="action_view_attendee_form" />
 
         <!--        ALARM FORM VIEW-->
@@ -153,14 +131,16 @@
             <field name="model">res.alarm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reminder details">
-                    <field name="name" />
-                    <field name="active" />
-                    <separator string="Reminder Details" colspan="4" />
-                    <field name="trigger_duration" select="1" />
-                    <field name="trigger_interval" select="1" />
-                    <field name="trigger_occurs" select="1" />
-                    <field name="trigger_related" select="1" />
+                <form string="Reminder details" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="active" />
+                        <separator string="Reminder Details" colspan="4" />
+                        <field name="trigger_duration" />
+                        <field name="trigger_interval" />
+                        <field name="trigger_occurs" />
+                        <field name="trigger_related" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -173,28 +153,29 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Reminder details">
-                <field name="name" select="1"/>
-                <field name="trigger_interval" select="1"/>
-                <field name="trigger_duration" select="1"/>
-                <field name="trigger_occurs" select="1"/>
-                <field name="trigger_related" select="1"/>
+                <field name="name"/>
+                <field name="trigger_interval"/>
+                <field name="trigger_duration"/>
+                <field name="trigger_occurs"/>
+                <field name="trigger_related"/>
                 </tree>
             </field>
         </record>
         <record id="action_res_alarm_view" model="ir.actions.act_window">
-            <field name="name">Available Alarms</field>
+            <field name="name">Alarms</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">Create specific calendar alarms that may be assigned to calendar events or meetings.</field>
         </record>
 
         <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended"
+            groups="base.group_no_one"
             action="base_calendar.action_res_alarm_view"
-            parent="base.menu_calendar_configuration" />
+            parent="base.menu_calendar_configuration" sequence="5"/>
 
         <!-- Event Form View-->
 
@@ -203,13 +184,21 @@
             <field name="model">calendar.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" string="Summary"
+                <form string="Events" version="7.0">
+                <header>
+                    <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
+                    <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
+                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
+                    <field name="state" widget="statusbar"
+                        statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet>
+                    <group col="6">
+                        <field name="name" string="Summary"
                             colspan="4" required="1" />
-                        <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
                         <newline/>
-                        <field name="date" string="Start Date" required="1" select="1"
+                        <field name="date" string="Start Date" required="1"
                             on_change="onchange_dates(date,duration,False,allday)" />
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
@@ -218,148 +207,146 @@
                         <field name="location" />
                         <field name="alarm_id" string="Reminder"
                             widget="selection" />
-                        <group colspan="2" col="4" >
-                               <field name="rrule_type" string="Recurrency"
-                                    colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                               <button string="Edit All"
-                                   help="Edit all Ourrences of recurrent Events"
-                                   attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                                   name="open_event" icon="gtk-edit"
-                                   type="object" />
-                               <button string="ExRule"
-                                    help="Add Exception Rule"
-                                    name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-                                    context="{'model' : 'calendar.event'}"
-                                    attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+                        <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
+                           <field name="recurrency"/>
                         </group>
                     </group>
-                    <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                        <separator string="Select data for Custom Rule" colspan="8"/>
-                        <group col="8" colspan="4">
-                            <field name="freq" />
-                            <field name="interval" />
-                            <field name="count" />
-                            <field name="end_date" />
-                        </group>
-                        <group col="14" colspan="4" name="Select weekdays"
-                            attrs="{'invisible' : [('freq','!=','weekly')]}">
-                            <field name="mo" colspan="1" />
-                            <field name="tu" colspan="1" />
-                            <field name="we" colspan="1" />
-                            <field name="th" colspan="1" />
-                            <field name="fr" colspan="1" />
-                            <field name="sa" colspan="1" />
-                            <field name="su" colspan="1" />
-                            <newline />
-                        </group>
-                        <group col="10" colspan="4"
-                            attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                            <group col="2" colspan="1">
-                                <field name="select1" />
-                            </group>
-                            <group col="2" colspan="1"
-                                attrs="{'invisible' : [('select1','=','day')]}">
-                                <field name="day"
-                                    attrs="{'required' : [('select1','=','date')]}" />
-                            </group>
-                            <group col="3" colspan="1"
-                                attrs="{'invisible' : [('select1','=','date')]}">
-                                <field name="byday" string="The"
-                                    attrs="{'required' : [('select1','=','day')]}" />
-                                <field name="week_list" nolabel="1"
-                                    attrs="{'required' : [('select1','=','day')]}" />
-                            </group>
-                            <group col="1" colspan="1"
-                                attrs="{'invisible' : [('freq','!=','yearly')]}">
-                                <field name="month_list" string="of"
-                                    colspan="1"
-                                    attrs="{'required' : [('freq','=','yearly')]}" />
-                            </group>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                     <page string="Event">
                         <group col="6" colspan="4">
                              <separator colspan="6" string="Visibility"/>
                              <field name="user_id" string="Responsible User" />
-                             <field name="show_as" string="Show time as"/>
+                             <field name="show_as" string="Show Time as"/>
                              <field name="class" string="Privacy"/>
                              <field name="recurrent_id" invisible="1" />
                              <field name="recurrent_uid" invisible="1" />
                         </group>
-                        <separator string="Description" colspan="4" />
-                        <field name="description" nolabel="1" colspan="4" />
-                        <separator colspan="4" string="" />
-                           <group col="5" colspan="4">
-                               <field name="state" select="2" />
-                               <button name="do_tentative"
-                                   states="confirmed,cancelled"
-                                   string="Uncertain"
-                                   type="object"
-                                   icon="terp-crm" />
-                               <button name="do_confirm"
-                                   string="Confirm"
-                                   states="tentative,cancelled"
-                                   type="object"
-                                   icon="gtk-apply" />
-                               <button name="do_cancel"
-                                   string="Cancel"
-                                   states="tentative,confirmed"
-                                   type="object"
-                                   icon="gtk-cancel" />
-                           </group>
-                        </page>
-                        <page string="Invitation Detail">
-                            <button string="Invite People"
-                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                icon="terp-partner" type="action"
-                                context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                            <field name="attendee_ids" colspan="4"
-                                nolabel="1" widget="one2many" mode="tree,form">
-                                <tree string="Invitation details" editable="top">
-                                    <field name="email" />
-                                    <field name="role" width="200" select="1" />
-                                    <field name="state" />
-                                </tree>
-                                <form string="Invitation details">
-                                    <notebook colspan="4">
-                                        <page string="Details">
+                        <separator string="Description"/>
+                        <field name="description"/>
+                    </page>
+                    <page string="Invitation Detail">
+                        <button string="Invite People"
+                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                            icon="terp-partner" type="action"
+                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                        <field name="attendee_ids" colspan="4"
+                            nolabel="1" widget="one2many" mode="tree">
+                            <tree string="Invitation details" editable="top">
+                                <field name="sent_by_uid" string="From"/>
+                                <field name="user_id" string="To"/>
+                                <field name="email" />
+                                <field name="role" width="200" />
+                                <field name="state" />
+                                <button name="do_tentative"
+                                    states="needs-action,declined,accepted"
+                                    string="Uncertain" type="object"
+                                    icon="terp-crm" />
+                                <button name="do_accept" string="Accept"
+                                    states="needs-action,tentative,declined"
+                                    type="object" icon="gtk-apply" />
+                                <button name="do_decline" string="Decline"
+                                    states="needs-action,tentative,accepted"
+                                    type="object" icon="gtk-cancel" />
+                                <button
+                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                    string="Delegate" type="action"
+                                    icon="gtk-sort-descending"
+                                    states="needs-action,tentative,declined,accepted"
+                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                            </tree>
+                            <form string="Invitation details" version="7.0">
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <group col="4">
                                             <field name="email" />
-                                            <field name="rsvp" select="1" />
-                                            <field name="cutype" select="1" />
-                                            <field name="role" select="1" />
-                                            <separator colspan="4" string="" />
-                                            <group col="6" colspan="4">
-                                                <field name="state" select="2" />
-                                                <button name="do_tentative"
-                                                    states="needs-action,declined,accepted"
-                                                    string="Uncertain"
-                                                    type="object"
-                                                    icon="terp-crm" />
-                                                <button name="do_accept"
-                                                    string="Accept"
-                                                    states="needs-action,tentative,declined"
-                                                    type="object"
-                                                    icon="gtk-apply" />
-                                                <button name="do_decline"
-                                                    string="Decline"
-                                                    states="needs-action,tentative,accepted"
-                                                    type="object"
-                                                    icon="gtk-cancel" />
-                                                <button
-                                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                    string="Delegate"
-                                                    type="action"
-                                                    icon="gtk-sort-descending"
-                                                    states="needs-action,tentative,declined,accepted"
-                                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                            </group>
-                                        </page>
+                                            <field name="rsvp"/>
+                                            <field name="cutype"/>
+                                            <field name="role"/>
+                                        </group>
+                                        <group col="4">
+                                            <field name="state"/>
+                                            <button name="do_tentative"
+                                                states="needs-action,declined,accepted"
+                                                string="Uncertain"
+                                                type="object"
+                                                icon="terp-crm" />
+                                            <button name="do_accept"
+                                                string="Accept"
+                                                states="needs-action,tentative,declined"
+                                                type="object"
+                                                icon="gtk-apply" />
+                                            <button name="do_decline"
+                                                string="Decline"
+                                                states="needs-action,tentative,accepted"
+                                                type="object"
+                                                icon="gtk-cancel" />
+                                            <button
+                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                string="Delegate"
+                                                type="action"
+                                                icon="gtk-sort-descending"
+                                                states="needs-action,tentative,declined,accepted"
+                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                        </group>
+                                    </page>
                                     </notebook>
                                 </form>
                             </field>
                         </page>
+                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)]}">
+                        <group col="4" colspan="4" name="rrule">
+                            <group col="4" colspan="4">
+                                <field name="rrule_type" string="Recurrency period"
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
+                                <field name="interval" />
+                                <separator string="End of Recurrence" colspan="4"/>
+                                <field name="end_type" />
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
+                                <newline />
+
+
+                            </group>
+                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                <separator string="Choose day where repeat the meeting" colspan="8"/>
+                                <field name="mo" colspan="1" />
+                                <field name="tu" colspan="1" />
+                                <field name="we" colspan="1" />
+                                <field name="th" colspan="1" />
+                                <newline/>
+                                <field name="fr" colspan="1" />
+                                <field name="sa" colspan="1"  />
+                                <field name="su" colspan="1"  />
+                                <newline />
+                            </group>
+                            <group col="10" colspan="4"
+                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
+                                <group col="2" colspan="1">
+                                    <field name="select1" />
+                                </group>
+                                <group col="2" colspan="1">
+                                    <field name="day"
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
+                                </group>
+                                <group col="3" colspan="1"
+                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
+                                    <field name="byday" string="The"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                    <field name="week_list" nolabel="1"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                </group>
+                            </group>
+                        </group>
+
+                    </page>
                     </notebook>
+                </sheet>
                 </form>
             </field>
         </record>
@@ -407,37 +394,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Events">
-                       <group col="12" colspan="4">
-                           <filter icon="terp-go-today" string="My Events"
-                               domain="[('user_id','=',uid)]"
-                               help="My Events" />
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-check" string="Confirmed"
-                               domain="[('state','=','confirmed')]"
-                               help="Confirmed Events" />
-                           <separator orientation="vertical"/>
-                           <field name="name" select="1" string="Summary"/>
-                           <field name="location" select="1" string="Location"/>
-                           <separator orientation="vertical"/>
-                           <field name="user_id" select="1"/>
-                           <separator orientation="vertical"/>
-                           <field name="show_as" select="1"/>
-                           <field name="class" select="1"/>
-                       </group>
-                       <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <filter string="Date" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date'}" />
-                            <filter string="Availability" icon="terp-camera_test"
-                                domain="[]" context="{'group_by':'show_as'}" />
-                            <filter string="Privacy" icon="terp-locked"
-                                domain="[]" context="{'group_by':'class'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Responsible" icon="terp-personal" domain="[]"
-                                context="{'group_by':'user_id'}" />
-                        </group>
+                    <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
+                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
+                    <separator/>
+                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
+                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -458,7 +428,7 @@
 
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
-                sequence="5" action="action_view_event" />
+                sequence="15" action="action_view_event" />
 
      </data>
  </openerp>