diff --git a/models/__pycache__/__init__.cpython-37.pyc b/models/__pycache__/__init__.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..30d67869ba480a0e7123dc3dcaccd8685ae5ae24
Binary files /dev/null and b/models/__pycache__/__init__.cpython-37.pyc differ
diff --git a/models/__pycache__/calendar.cpython-37.pyc b/models/__pycache__/calendar.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..98711bc990fcc29fd141fce5497f79b6ac4da833
Binary files /dev/null and b/models/__pycache__/calendar.cpython-37.pyc differ
diff --git a/models/__pycache__/hr_timesheet.cpython-37.pyc b/models/__pycache__/hr_timesheet.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..da5157fb23de2289b7fa60ac5c7a3569e557e604
Binary files /dev/null and b/models/__pycache__/hr_timesheet.cpython-37.pyc differ
diff --git a/models/calendar.py b/models/calendar.py
index fd7d4d69a73df2938779e216dd567b97918ed2dc..0cda0751ab5a34c964f838cb024d089927040661 100644
--- a/models/calendar.py
+++ b/models/calendar.py
@@ -34,18 +34,12 @@ class CalendarEvent(models.Model):
task_id = fields.Many2one(
comodel_name="project.task",
string="Tâche liée")
- is_transfered = fields.Boolean(
+ is_transfered = fields.Selection([('is_transfered', 'Transféré'), ('is_no_transfered', 'Pas Transféré')],
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)
+ compute='_compute_is_transfered')
is_attendee = fields.Boolean(
string='Est participant',
- compute='_compute_is_attendee',
- default=False)
+ compute='_compute_is_attendee')
# ------------------------------------------------------
# Compute
@@ -60,16 +54,9 @@ class CalendarEvent(models.Model):
if (attendee.timesheet_ids
and attendee.timesheet_ids.filtered(
lambda t: t.date == event.start.date())):
- event.is_transfered = True
+ event.is_transfered = 'is_transfered'
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
+ event.is_transfered = 'is_no_transfered'
def _compute_is_attendee(self):
for event in self:
@@ -123,7 +110,6 @@ 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,
@@ -242,9 +228,9 @@ class CalendarEvent(models.Model):
if (attendee.timesheet_ids
and attendee.timesheet_ids.filtered(
lambda t: t.date == Date.to_date(ls[1]))):
- res['is_transfered'] = True
+ res['is_transfered'] = 'is_transfered'
else:
- res['is_transfered'] = False
+ res['is_transfered'] = 'is_no_transfered'
res['id'] = calendar_id
result.append(res)
diff --git a/views/calendar_views.xml b/views/calendar_views.xml
index 0a79728ef203315be337b45f6744a5cdc7a54304..35f6de9d6bc0d0888760783030432bbb66be1ca2 100644
--- a/views/calendar_views.xml
+++ b/views/calendar_views.xml
@@ -38,7 +38,7 @@
name="create_timesheet"
class="oe_highlight"
attrs="{'invisible':
- ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/>
+ ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', 'is_transfered')]}"/>
</header>
</sheet>
<div class="oe_title" position="before">
@@ -67,7 +67,7 @@
name="create_timesheet"
class="oe_highlight"
attrs="{'invisible':
- ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/>
+ ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', 'is_transfered')]}"/>
</button>
<group position="after">
<group>
@@ -88,9 +88,12 @@
<calendar position="attributes">
<attribute name="quick_add">False</attribute>
</calendar>
+
+ <field name="is_highlighted" position="after">
+ <field name="is_transfered"/>
+ </field>
<field name="name" position="before">
<field name="task_id"/>
- <field name="is_fdp_exists"/>
</field>
</field>
</record>
@@ -102,9 +105,6 @@
<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'))]"/>
diff --git a/wizard/__pycache__/__init__.cpython-37.pyc b/wizard/__pycache__/__init__.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..37837e5f999d7b63c32e398d41fac05b67693efe
Binary files /dev/null and b/wizard/__pycache__/__init__.cpython-37.pyc differ
diff --git a/wizard/__pycache__/calendar_event_transform.cpython-37.pyc b/wizard/__pycache__/calendar_event_transform.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d75128a8d5f90fcabf3959ce624b7a8f7b2d24c8
Binary files /dev/null and b/wizard/__pycache__/calendar_event_transform.cpython-37.pyc differ