From 34343a9d737cb86309dcc609b5fd52275953732a Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Wed, 27 Oct 2021 18:26:02 +0200 Subject: [PATCH] [ADD]Add filter to check timesheet linked in event --- models/calendar.py | 12 ++++++++++++ views/calendar_views.xml | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/models/calendar.py b/models/calendar.py index a9808bf..fd7d4d6 100644 --- a/models/calendar.py +++ b/models/calendar.py @@ -38,6 +38,10 @@ class CalendarEvent(models.Model): string='Transféré', compute='_compute_is_transfered', default=False) + is_fdp_exists = fields.Boolean( + string='Feuille de temps existe', + compute='_compute_is_fdp_exists', + default=False, store=True) is_attendee = fields.Boolean( string='Est participant', compute='_compute_is_attendee', @@ -60,6 +64,13 @@ class CalendarEvent(models.Model): else: event.is_transfered = False + @api.depends('is_transfered') + def _compute_is_fdp_exists(self): + for event in self: + timesheet_id = self.env['account.analytic.line'].search([('event_id', '=', event.id)]) + if timesheet_id: + event.is_fdp_exists = True + def _compute_is_attendee(self): for event in self: if self.env.user.partner_id in event.partner_ids: @@ -112,6 +123,7 @@ class CalendarEvent(models.Model): raise UserError("Vous avez déjà transféré cette entrée \ d'agenda : %s" % event.name) else: + event.is_fdp_exists = True values = { 'user_id': self.env.user.id, 'project_id': event.project_id.id, diff --git a/views/calendar_views.xml b/views/calendar_views.xml index 46955fc..0a79728 100644 --- a/views/calendar_views.xml +++ b/views/calendar_views.xml @@ -90,6 +90,7 @@ </calendar> <field name="name" position="before"> <field name="task_id"/> + <field name="is_fdp_exists"/> </field> </field> </record> @@ -101,6 +102,9 @@ <field name="inherit_id" ref="calendar.view_calendar_event_search"/> <field name="arch" type="xml"> <filter name="mymeetings" position="after"> + <separator/> + <filter string="A transférer en FDT" name="is_not_fdp" domain="[('is_fdp_exists','!=',True)]"/> + <filter string="Transférés en FDT" name="is_fdp" domain="[('is_fdp_exists','=',True)]"/> <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'))]"/> -- GitLab