Skip to content
Extraits de code Groupes Projets
Valider b2c9174b rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

Revert "[ADD]Add filter to check timesheet linked in event"

This reverts commit 34343a9d.
parent cad151a1
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -38,10 +38,6 @@ class CalendarEvent(models.Model): ...@@ -38,10 +38,6 @@ class CalendarEvent(models.Model):
string='Transféré', string='Transféré',
compute='_compute_is_transfered', compute='_compute_is_transfered',
default=False) 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( is_attendee = fields.Boolean(
string='Est participant', string='Est participant',
compute='_compute_is_attendee', compute='_compute_is_attendee',
...@@ -64,13 +60,6 @@ class CalendarEvent(models.Model): ...@@ -64,13 +60,6 @@ class CalendarEvent(models.Model):
else: else:
event.is_transfered = False 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): def _compute_is_attendee(self):
for event in self: for event in self:
if self.env.user.partner_id in event.partner_ids: if self.env.user.partner_id in event.partner_ids:
...@@ -123,7 +112,6 @@ class CalendarEvent(models.Model): ...@@ -123,7 +112,6 @@ class CalendarEvent(models.Model):
raise UserError("Vous avez déjà transféré cette entrée \ raise UserError("Vous avez déjà transféré cette entrée \
d'agenda : %s" % event.name) d'agenda : %s" % event.name)
else: else:
event.is_fdp_exists = True
values = { values = {
'user_id': self.env.user.id, 'user_id': self.env.user.id,
'project_id': event.project_id.id, 'project_id': event.project_id.id,
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
</calendar> </calendar>
<field name="name" position="before"> <field name="name" position="before">
<field name="task_id"/> <field name="task_id"/>
<field name="is_fdp_exists"/>
</field> </field>
</field> </field>
</record> </record>
...@@ -102,9 +101,6 @@ ...@@ -102,9 +101,6 @@
<field name="inherit_id" ref="calendar.view_calendar_event_search"/> <field name="inherit_id" ref="calendar.view_calendar_event_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<filter name="mymeetings" position="after"> <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/> <separator/>
<filter string="Ce mois-ci" name="this_month" domain="[('start','&lt;=', (context_today()-relativedelta(day=31, months=0)).strftime('%Y-%m-%d')), <filter string="Ce mois-ci" name="this_month" domain="[('start','&lt;=', (context_today()-relativedelta(day=31, months=0)).strftime('%Y-%m-%d')),
('start','&gt;=',(context_today()-relativedelta(day=1,months=0)).strftime('%Y-%m-%d'))]"/> ('start','&gt;=',(context_today()-relativedelta(day=1,months=0)).strftime('%Y-%m-%d'))]"/>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter