diff --git a/models/calendar.py b/models/calendar.py index 3c0439f6d0634c0ea497f46b02abdaadfa40f676..a9808bfd661de20168550e625b10224e78c3e955 100644 --- a/models/calendar.py +++ b/models/calendar.py @@ -33,11 +33,11 @@ class CalendarEvent(models.Model): domain=[('allow_timesheets', '=', True)]) task_id = fields.Many2one( comodel_name="project.task", - string="Tâche lié") + string="Tâche liée") is_transfered = fields.Boolean( string='Transféré', compute='_compute_is_transfered', - default=False,) + default=False) is_attendee = fields.Boolean( string='Est participant', compute='_compute_is_attendee', diff --git a/views/calendar_views.xml b/views/calendar_views.xml index d1a273ad70b826023a7edc47d1caed472d1cf7bf..cce8a61962128cc8b5ba3b733d85e9c386b8febf 100644 --- a/views/calendar_views.xml +++ b/views/calendar_views.xml @@ -41,11 +41,15 @@ ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/> </header> </sheet> + <div class="oe_title" position="before"> + <group> + <field name="project_id" required="1" options="{'no_open': True, 'no_create': True}"/> + <field name="task_id" required="1" options="{'no_open': True, 'no_create': True}"/> + </group> + </div> <field name="start_date" position="before"> <field name="is_transfered"/> <field name="is_attendee" invisible="1"/> - <field name="project_id" required="1" options="{'no_open': True, 'no_create': True}"/> - <field name="task_id" required="1" options="{'no_open': True, 'no_create': True}"/> </field> </field> </record> @@ -87,5 +91,25 @@ </field> </record> + <!-- Search view --> + <record id="sapoval_view_calendar_search_inherited" model="ir.ui.view"> + <field name="name">calendar.event.sapoval.search</field> + <field name="model">calendar.event</field> + <field name="inherit_id" ref="calendar.view_calendar_event_search"/> + <field name="arch" type="xml"> + <filter name="mymeetings" position="after"> + <separator/> + <filter string="Ce mois-ci" name="this_month" domain="[('start','<=', (context_today()-relativedelta(day=31, months=0)).strftime('%Y-%m-%d')), + ('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> + <filter name="privacy" position="after"> + <separator/> + <filter name="start" string="Date de début" context="{'group_by': 'start'}"/> + </filter> + </field> + </record> + </data> </odoo>