diff --git a/views/calendar.xml b/views/calendar.xml index 2dc6a7b08f6f5da21dabbe6d25657432c5ddad54..b1e4090074ae580039d9bdf468a543954c578a35 100644 --- a/views/calendar.xml +++ b/views/calendar.xml @@ -231,6 +231,8 @@ ('start','>=',(context_today()-relativedelta(day=1,months=0)).strftime('%Y-%m-%d'))]"/> <filter string="Le mois pécédent" name="last_month" domain="[('start','<=', (context_today()-relativedelta(day=31, months=1)).strftime('%Y-%m-%d')), ('start','>=',(context_today()-relativedelta(day=1,months=1)).strftime('%Y-%m-%d'))]"/> + <filter string="Ce trimestre" name="this_trimester" domain="[ + ('start','>=',(context_today()-relativedelta(months=3)).strftime('%Y-%m-%d'))]" invisible="1"/> </filter> <filter name="privacy" position="after"> <separator/> @@ -266,7 +268,7 @@ <field name="type" options="{'no_open': True, 'no_create': True}" /> <field name="partner_id" options="{'no_open': True, 'no_create': True}" invisible="1"/> <field name="attendees_initial" /> - <field name="partner_ids" domain="[('user_ids', '!=', False), ('ur_id', '=', ur_id)]" invisible="1"/> + <field name="partner_ids" domain="[('user_ids', '!=', False), ('ur_id', '=', ur_id)]"/> <field name="is_highlighted" invisible="1" /> </resource> </field> @@ -278,7 +280,23 @@ ****************************** --> <!-- Override Calendar Event action --> <record id="calendar.action_calendar_event" model="ir.actions.act_window"> - <field name="context">{ 'ur_sidebar_filter': True }</field> + <field name="context">{ + 'ur_sidebar_filter': True, + 'search_default_this_trimester': True, + }</field> + </record> + + <record id="action_calendar_my_events" model="ir.actions.act_window"> + <field name="name">Mes Rendez-vous</field> + <field name="res_model">calendar.event</field> + <field name="view_mode">calendar,tree,form</field> + <field name="view_id" ref="calendar.view_calendar_event_calendar"/> + <field name="search_view_id" ref="calendar.view_calendar_event_search"/> + <field name="view_mode">calendar,tree,form</field> + <field name="context">{ + 'ur_sidebar_filter': True, + 'search_default_mymeetings': True + }</field> </record> <!-- Ressource Action --> @@ -292,11 +310,32 @@ (0, 0, {'view_mode': 'calendar', 'view_id': ref('calendar.view_calendar_event_calendar')}), (0, 0, {'view_mode': 'tree', 'view_id': ref('calendar.view_calendar_event_tree')}), (0, 0, {'view_mode': 'form', 'view_id': ref('calendar.view_calendar_event_form')})]"/> + </record> <!-- ****************************** *** Menus ****************************** --> + <menuitem + id="mail_submenu_calendar" + name="Calendrier" + parent="calendar.mail_menu_calendar" + sequence="1"/> + <menuitem + id="menu_calendar_scop_all" + parent="mail_submenu_calendar" + name="Toutes les entrées" + sequence="1" + action="calendar.action_calendar_event" + groups="base.group_user"/> + <menuitem + id="menu_calendar_scop_my_events" + parent="mail_submenu_calendar" + name="Mes rendez-vous" + sequence="10" + action="action_calendar_my_events" + groups="base.group_user"/> + <menuitem id="menu_calendar_scop" parent="calendar.mail_menu_calendar"