Skip to content
Snippets Groups Projects
Commit cad151a1 authored by Rémi - Le Filament's avatar Rémi - Le Filament
Browse files

Revert "[ADD]Add field transfered"

This reverts commit 1a252246.
parent 4e740a5d
No related branches found
No related tags found
No related merge requests found
File deleted
File deleted
File deleted
...@@ -34,12 +34,18 @@ class CalendarEvent(models.Model): ...@@ -34,12 +34,18 @@ class CalendarEvent(models.Model):
task_id = fields.Many2one( task_id = fields.Many2one(
comodel_name="project.task", comodel_name="project.task",
string="Tâche liée") string="Tâche liée")
is_transfered = fields.Selection([('is_transfered', 'Transféré'), ('is_no_transfered', 'Pas Transféré')], is_transfered = fields.Boolean(
string='Transféré', string='Transféré',
compute='_compute_is_transfered') 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( is_attendee = fields.Boolean(
string='Est participant', string='Est participant',
compute='_compute_is_attendee') compute='_compute_is_attendee',
default=False)
# ------------------------------------------------------ # ------------------------------------------------------
# Compute # Compute
...@@ -54,9 +60,16 @@ class CalendarEvent(models.Model): ...@@ -54,9 +60,16 @@ class CalendarEvent(models.Model):
if (attendee.timesheet_ids if (attendee.timesheet_ids
and attendee.timesheet_ids.filtered( and attendee.timesheet_ids.filtered(
lambda t: t.date == event.start.date())): lambda t: t.date == event.start.date())):
event.is_transfered = 'is_transfered' event.is_transfered = True
else: else:
event.is_transfered = 'is_no_transfered' 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:
...@@ -110,6 +123,7 @@ class CalendarEvent(models.Model): ...@@ -110,6 +123,7 @@ 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,
...@@ -228,9 +242,9 @@ class CalendarEvent(models.Model): ...@@ -228,9 +242,9 @@ class CalendarEvent(models.Model):
if (attendee.timesheet_ids if (attendee.timesheet_ids
and attendee.timesheet_ids.filtered( and attendee.timesheet_ids.filtered(
lambda t: t.date == Date.to_date(ls[1]))): lambda t: t.date == Date.to_date(ls[1]))):
res['is_transfered'] = 'is_transfered' res['is_transfered'] = True
else: else:
res['is_transfered'] = 'is_no_transfered' res['is_transfered'] = False
res['id'] = calendar_id res['id'] = calendar_id
result.append(res) result.append(res)
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
name="create_timesheet" name="create_timesheet"
class="oe_highlight" class="oe_highlight"
attrs="{'invisible': attrs="{'invisible':
['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', 'is_transfered')]}"/> ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/>
</header> </header>
</sheet> </sheet>
<div class="oe_title" position="before"> <div class="oe_title" position="before">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
name="create_timesheet" name="create_timesheet"
class="oe_highlight" class="oe_highlight"
attrs="{'invisible': attrs="{'invisible':
['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', 'is_transfered')]}"/> ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/>
</button> </button>
<group position="after"> <group position="after">
<group> <group>
...@@ -88,12 +88,9 @@ ...@@ -88,12 +88,9 @@
<calendar position="attributes"> <calendar position="attributes">
<attribute name="quick_add">False</attribute> <attribute name="quick_add">False</attribute>
</calendar> </calendar>
<field name="is_highlighted" position="after">
<field name="is_transfered"/>
</field>
<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>
...@@ -105,6 +102,9 @@ ...@@ -105,6 +102,9 @@
<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'))]"/>
......
File deleted
File deleted
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment