diff --git a/models/calendar.py b/models/calendar.py
index 097846a83c595106643a0e5e8ee77155a691f3d3..3c0439f6d0634c0ea497f46b02abdaadfa40f676 100644
--- a/models/calendar.py
+++ b/models/calendar.py
@@ -37,7 +37,7 @@ class CalendarEvent(models.Model):
     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',
@@ -98,8 +98,8 @@ class CalendarEvent(models.Model):
                 raise UserError("Vous ne faites pas partie des participants, \
                     vous ne pouvez donc pas transformer cette entrée d'agenda \
                     en ligne de temps.")
-            if not event.project_id.analytic_account_id:
-                raise UserError("Le code activité UR doit être \
+            if not event.project_id:
+                raise UserError("Un projet doit être \
                                 renseigné sur chaque entrée d'agenda")
             else:
                 attendee = self.env['calendar.attendee'].search([
diff --git a/views/calendar_views.xml b/views/calendar_views.xml
index 99e5ef17d3869a57cd50ce9ed0bfa8e552acea59..d1a273ad70b826023a7edc47d1caed472d1cf7bf 100644
--- a/views/calendar_views.xml
+++ b/views/calendar_views.xml
@@ -17,6 +17,7 @@
             <field name="arch" type="xml">
                 <field name="location" position="after">
                     <field name="project_id"/>
+                    <field name="task_id"/>
                     <field name="is_transfered" />
                 </field>
             </field>
@@ -41,26 +42,50 @@
                     </header>
                 </sheet>
                 <field name="start_date" position="before">
-                    <field name="is_transfered" widget="toggle_button"/>
+                    <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" options="{'no_open': True, 'no_create': True}"/>
+                    <field name="task_id" required="1" options="{'no_open': True, 'no_create': True}"/>
                 </field>
             </field>
         </record>
 
-        <!-- Calendar view -->
-        <record id="view_calendar_calendar_inherited" model="ir.ui.view">
-            <field name="name">sapoval.calendar.event.calendar</field>
+        <record id="view_calendar_event_form_popup" model="ir.ui.view">
+            <field name="name">calendar.event.form.sapoval</field>
             <field name="model">calendar.event</field>
-            <field name="inherit_id" ref="calendar.view_calendar_event_calendar"/>
+            <field name="inherit_id" ref="calendar.view_calendar_event_form_popup"/>
             <field name="arch" type="xml">
-                <field name="partner_ids" position="before">
-                    <field name="project_id" invisible="1"/>
-                </field>
+
+                <button name="action_open_calendar_event" position="after">
+                    <button
+                        string="Transformer en ligne de temps"
+                        type="object"
+                        name="create_timesheet"
+                        class="oe_highlight"
+                        attrs="{'invisible':
+                            ['|', '|', '|', ('project_id', '=', False), ('is_attendee', '!=', True), ('is_transfered', '=', True)]}"/>
+                </button>
+                <group position="after">
+                    <group>
+                        <field name="project_id"/>
+                        <field name="task_id"/>
+                        <field name="is_transfered" invisible="1"/>
+                        <field name="is_attendee" invisible="1"/>
+                    </group>
+                </group>
             </field>
         </record>
 
+        <record id="view_calendar_event_calendar" model="ir.ui.view">
+            <field name="name">calendar.event.sapoval.calendar</field>
+            <field name="model">calendar.event</field>
+            <field name="inherit_id" ref="calendar.view_calendar_event_calendar"/>
+            <field name="arch" type="xml">
+                <calendar position="attributes">
+                    <attribute name="quick_add">False</attribute>
+                </calendar>
+            </field>
+        </record>
 
     </data>
 </odoo>
diff --git a/views/hr_timesheet_views.xml b/views/hr_timesheet_views.xml
deleted file mode 100644
index 8599dc2f400ed741b0be5333e86490f92b52db75..0000000000000000000000000000000000000000
--- a/views/hr_timesheet_views.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--<?xml version="1.0"?>-->
-<!--&lt;!&ndash; Copyright 2021 Le Filament-->
-<!--     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). &ndash;&gt;-->
-
-<!--<odoo>-->
-<!--    <data>-->
-
-<!--        &lt;!&ndash; Tree View Timesheet &ndash;&gt;-->
-<!--        <record id="view_hr_timesheet_calendar_line_tree" model="ir.ui.view">-->
-<!--            <field name="name">account.analytic.line.calendar</field>-->
-<!--            <field name="model">account.analytic.line</field>-->
-<!--            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <field name="ur_financial_system_nb" position="after">-->
-<!--                    <field name="type_event" readonly="1"/>-->
-<!--                </field>-->
-<!--            </field>-->
-<!--        </record>-->
-
-<!--    </data>-->
-<!--</odoo>-->
\ No newline at end of file
diff --git a/wizard/calendar_event_transform_views.xml b/wizard/calendar_event_transform_views.xml
index 010e7f2e29f951e68c90ae7dd713c0d307a99564..3eed9e04cc6269c49ba7f841d94937bd81af9090 100644
--- a/wizard/calendar_event_transform_views.xml
+++ b/wizard/calendar_event_transform_views.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Transformer en ligne de temps">
                     <p class="oe_grey">
-                        Les entrées d'agendas suivantes vont être transformées en lignes de temps.
+                        Les entrées d'agendas sélectionnées vont être transformées en lignes de temps.
                         Pensez à vérifier qu'un projet a été renseigné pour chaque entrée.
                     </p>
                     <footer>