diff --git a/project_timesheet_time_control/README.rst b/project_timesheet_time_control/README.rst
index 465bb1fef2..e4df079608 100644
--- a/project_timesheet_time_control/README.rst
+++ b/project_timesheet_time_control/README.rst
@@ -17,13 +17,13 @@ Project timesheet time control
     :target: https://github.com/OCA/project/tree/15.0/project_timesheet_time_control
     :alt: OCA/project
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_timesheet_time_control
+    :target: https://translation.odoo-community.org/projects/project-15-0/project-15-0-project_timesheet_time_control
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
     :target: https://runbot.odoo-community.org/runbot/140/15.0
     :alt: Try me on Runbot
 
-|badge1| |badge2| |badge3| |badge4| |badge5|
+|badge1| |badge2| |badge3| |badge4| |badge5| 
 
 Allow to track the exact moment when a timesheet line is started (not only
 the day, but also the minute and second) and let users start and stop timers
@@ -137,6 +137,7 @@ Contributors
     * Luis M. ontalba
     * Ernesto Tejeda
     * Jairo Llopis
+    * Carlos Roca
 
 Maintainers
 ~~~~~~~~~~~
@@ -157,7 +158,7 @@ promote its widespread use.
 
 Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-ernestotejeda|
+|maintainer-ernestotejeda| 
 
 This module is part of the `OCA/project <https://github.com/OCA/project/tree/15.0/project_timesheet_time_control>`_ project on GitHub.
 
diff --git a/project_timesheet_time_control/i18n/es.po b/project_timesheet_time_control/i18n/es.po
index 31672adc5a..011b18bbe3 100644
--- a/project_timesheet_time_control/i18n/es.po
+++ b/project_timesheet_time_control/i18n/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-15 09:35+0000\n"
-"PO-Revision-Date: 2019-10-15 10:55+0100\n"
+"POT-Creation-Date: 2022-10-05 14:28+0000\n"
+"PO-Revision-Date: 2022-10-05 16:32+0200\n"
 "Last-Translator: Jairo Llopis <yajo.sk8@gmail.com>\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 
 #. module: project_timesheet_time_control
 #: code:addons/project_timesheet_time_control/wizards/hr_timesheet_switch.py:0
@@ -32,9 +32,13 @@ msgstr ""
 
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
+#, fuzzy
+#| msgid ""
+#| ".\n"
+#| "                        If you continue, it will be stopped with"
 msgid ""
 ".\n"
-"                        If you continue, it will be stopped with"
+"                            If you continue, it will be stopped with"
 msgstr ""
 ".\n"
 "                        Si continúa, se detendrá con"
@@ -45,6 +49,8 @@ msgid ""
 "<br/>\n"
 "                    <span>to</span>"
 msgstr ""
+"<br/>\n"
+"                    <span>hasta</span>"
 
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_project_kanban_inherited
@@ -76,26 +82,11 @@ msgstr ""
 "                            Detener trabajo\n"
 "                        </span>"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__amount
-msgid "Amount"
-msgstr "Cantidad"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__account_id
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_account_analytic_line
 msgid "Analytic Line"
 msgstr "Línea analítica"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_type
-msgid "Billable Type"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "Cancel"
@@ -111,33 +102,11 @@ msgstr ""
 "No se puede detener el cronómetro %d porque no está en marcha. Refresque la "
 "página y pruebe de nuevo."
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_category_id
-msgid "Category"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__is_task_closed
-msgid "Closing Stage"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__code
-msgid "Code"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__company_id
 msgid "Company"
 msgstr "Compañía"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_category_id
-msgid ""
-"Conversion between Units of Measure can only occur if they belong to the "
-"same category. The conversion will be made based on the ratios."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__create_uid
 msgid "Created by"
@@ -149,50 +118,25 @@ msgid "Created on"
 msgstr "Creado el"
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__currency_id
-msgid "Currency"
-msgstr "Moneda"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__date
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_form2_inherited
 msgid "Date"
 msgstr "Fecha"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__department_id
-msgid "Department"
-msgstr "Departmento"
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__name
 msgid "Description"
 msgstr "Descripción"
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__display_name
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__display_name
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__employee_id
-msgid "Employee"
-msgstr "Empleado"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__encoding_uom_id
-msgid "Encoding Uom"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__date_time_end
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__date_time_end
 msgid "End Time"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.account_analytic_line_tree
@@ -204,18 +148,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_kanban
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_tree2_inherited
 msgid "End work"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__general_account_id
-#, fuzzy
-msgid "Financial Account"
-msgstr "Cuenta analítica"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__group_id
-msgid "Group"
-msgstr "Grupo"
+msgstr "Finalizar trabajo"
 
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_hr_timesheet_switch
@@ -223,17 +156,12 @@ msgid "Helper to quickly switch between timesheet lines"
 msgstr "Ayudante para cambiar rápidamente de línea del parte de horas"
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__id
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__id
 msgid "ID"
 msgstr "ID"
 
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_account_analytic_line__show_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_project_project__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_project_task__show_time_control
@@ -243,31 +171,7 @@ msgstr ""
 "alguno."
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_id
-msgid "Invoice"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_id
-msgid "Invoice created from the timesheet"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__is_so_line_edited
-msgid "Is So Line Edited"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__move_id
-msgid "Journal Item"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line____last_update
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task____last_update
 msgid "Last Modified on"
 msgstr "Última modificación el"
 
@@ -297,14 +201,9 @@ msgstr ""
 "%(record)s. Refresque la página y pruebe de nuevo."
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__non_allow_billable
-msgid "Non-Billable"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__partner_id
-msgid "Partner"
-msgstr "Contacto"
+#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__analytic_line_id
+msgid "Origin line"
+msgstr "Linea origen"
 
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__running_timer_id
@@ -322,41 +221,19 @@ msgstr "Duración del cronómetro anterior"
 msgid "Previous timer start"
 msgstr "Comienzo del cronómetro anterior"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_id
-msgid "Product"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_project_project
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__project_id
 msgid "Project"
 msgstr "Proyecto"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__stock_task_id
-msgid "Project Task"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__unit_amount
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__ref
-msgid "Ref."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__account_analytic_line__show_time_control__resume
-#: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_switch__show_time_control__resume
 msgid "Resume"
 msgstr "Continuar"
 
 #. module: project_timesheet_time_control
 #: code:addons/project_timesheet_time_control/models/account_analytic_line.py:0
-#: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.account_analytic_line_tree
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_line_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_kanban_account_analytic_line
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_form2_inherited
@@ -364,14 +241,8 @@ msgstr "Continuar"
 msgid "Resume work"
 msgstr "Continuar trabajo"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__so_line
-msgid "Sales Order Item"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__show_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__show_time_control
@@ -389,7 +260,7 @@ msgstr "Comenzar"
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__date_time
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__date_time
 msgid "Start Time"
-msgstr ""
+msgstr "Fecha y hora"
 
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
@@ -414,7 +285,6 @@ msgstr "Comenzar trabajo"
 
 #. module: project_timesheet_time_control
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__account_analytic_line__show_time_control__stop
-#: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_switch__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_time_control_mixin__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__project_project__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__project_task__show_time_control__stop
@@ -432,7 +302,6 @@ msgid "Stop that very old timer and start the new one"
 msgstr "Detener ese cronómetro tan antiguo y comenzar el nuevo"
 
 #. module: project_timesheet_time_control
-#: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.account_analytic_line_tree
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_line_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.project_invoice_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_kanban_account_analytic_line
@@ -443,22 +312,12 @@ msgstr "Detener ese cronómetro tan antiguo y comenzar el nuevo"
 msgid "Stop work"
 msgstr "Detener trabajo"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__tag_ids
-msgid "Tags"
-msgstr "Etiquetas"
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_project_task
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__task_id
 msgid "Task"
 msgstr "Tarea"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__is_task_closed
-msgid "Tasks in this stage are considered as closed."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "That is a lot of time! Make sure it is fine before saving."
@@ -477,16 +336,6 @@ msgstr ""
 msgid "This timer is running and will be stopped"
 msgstr "Este cronómetro está en marcha y se detendrá"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_id
-msgid "Unit of Measure"
-msgstr "Unidad de medida"
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__user_id
-msgid "User"
-msgstr "Usuario"
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__running_timer_duration
 msgid "When the previous timer is stopped, it will save this duration."
@@ -497,11 +346,6 @@ msgstr "Cuando se detenga el cronómetro anterior, tendrá esta duración."
 msgid "You have a running timer called"
 msgstr "Tiene un cronómetro en marcha llamado"
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__non_allow_billable
-msgid "Your timesheet will not be billed."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "and started at"
@@ -511,12 +355,3 @@ msgstr "que comenzó el"
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "hour(s)."
 msgstr "hora(s)."
-
-#~ msgid "Closed"
-#~ msgstr "Cerrado"
-
-#~ msgid "Tasks in this stage are considered closed."
-#~ msgstr "Tareas en esta etapa se considerarán cerradas."
-
-#~ msgid "Date Time"
-#~ msgstr "Fecha y hora"
diff --git a/project_timesheet_time_control/i18n/project_timesheet_time_control.pot b/project_timesheet_time_control/i18n/project_timesheet_time_control.pot
index bcbf61862c..0f6a12027b 100644
--- a/project_timesheet_time_control/i18n/project_timesheet_time_control.pot
+++ b/project_timesheet_time_control/i18n/project_timesheet_time_control.pot
@@ -4,8 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-10-05 14:28+0000\n"
+"PO-Revision-Date: 2022-10-05 14:28+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,7 +27,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid ""
 ".\n"
-"                        If you continue, it will be stopped with"
+"                            If you continue, it will be stopped with"
 msgstr ""
 
 #. module: project_timesheet_time_control
@@ -53,26 +55,11 @@ msgid ""
 "                        </span>"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__amount
-msgid "Amount"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__account_id
-msgid "Analytic Account"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_account_analytic_line
 msgid "Analytic Line"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_type
-msgid "Billable Type"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "Cancel"
@@ -86,33 +73,11 @@ msgid ""
 "again."
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_category_id
-msgid "Category"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__is_task_closed
-msgid "Closing Stage"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__code
-msgid "Code"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__company_id
 msgid "Company"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_category_id
-msgid ""
-"Conversion between Units of Measure can only occur if they belong to the "
-"same category. The conversion will be made based on the ratios."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__create_uid
 msgid "Created by"
@@ -124,45 +89,20 @@ msgid "Created on"
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__currency_id
-msgid "Currency"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__date
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_form2_inherited
 msgid "Date"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__department_id
-msgid "Department"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__name
 msgid "Description"
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__display_name
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__display_name
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__employee_id
-msgid "Employee"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__encoding_uom_id
-msgid "Encoding Uom"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__date_time_end
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__date_time_end
@@ -181,33 +121,18 @@ msgstr ""
 msgid "End work"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__general_account_id
-msgid "Financial Account"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__group_id
-msgid "Group"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_hr_timesheet_switch
 msgid "Helper to quickly switch between timesheet lines"
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__id
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__id
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__id
 msgid "ID"
 msgstr ""
 
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_account_analytic_line__show_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_project_project__show_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_project_task__show_time_control
@@ -215,31 +140,7 @@ msgid "Indicate which time control button to show, if any."
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_id
-msgid "Invoice"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__timesheet_invoice_id
-msgid "Invoice created from the timesheet"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__is_so_line_edited
-msgid "Is So Line Edited"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__move_id
-msgid "Journal Item"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line____last_update
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project____last_update
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -267,13 +168,8 @@ msgid ""
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__non_allow_billable
-msgid "Non-Billable"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__partner_id
-msgid "Partner"
+#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__analytic_line_id
+msgid "Origin line"
 msgstr ""
 
 #. module: project_timesheet_time_control
@@ -292,41 +188,19 @@ msgstr ""
 msgid "Previous timer start"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_id
-msgid "Product"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_project_project
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__project_id
 msgid "Project"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__stock_task_id
-msgid "Project Task"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__unit_amount
-msgid "Quantity"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__ref
-msgid "Ref."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__account_analytic_line__show_time_control__resume
-#: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_switch__show_time_control__resume
 msgid "Resume"
 msgstr ""
 
 #. module: project_timesheet_time_control
 #: code:addons/project_timesheet_time_control/models/account_analytic_line.py:0
-#: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.account_analytic_line_tree
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_line_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_kanban_account_analytic_line
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_task_form2_inherited
@@ -334,14 +208,8 @@ msgstr ""
 msgid "Resume work"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__so_line
-msgid "Sales Order Item"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_account_analytic_line__show_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_time_control_mixin__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_project__show_time_control
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_project_task__show_time_control
@@ -384,7 +252,6 @@ msgstr ""
 
 #. module: project_timesheet_time_control
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__account_analytic_line__show_time_control__stop
-#: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_switch__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__hr_timesheet_time_control_mixin__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__project_project__show_time_control__stop
 #: model:ir.model.fields.selection,name:project_timesheet_time_control.selection__project_task__show_time_control__stop
@@ -402,7 +269,6 @@ msgid "Stop that very old timer and start the new one"
 msgstr ""
 
 #. module: project_timesheet_time_control
-#: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.account_analytic_line_tree
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_line_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.project_invoice_form
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.view_kanban_account_analytic_line
@@ -413,22 +279,12 @@ msgstr ""
 msgid "Stop work"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__tag_ids
-msgid "Tags"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model,name:project_timesheet_time_control.model_project_task
 #: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__task_id
 msgid "Task"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__is_task_closed
-msgid "Tasks in this stage are considered as closed."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "That is a lot of time! Make sure it is fine before saving."
@@ -444,16 +300,6 @@ msgstr ""
 msgid "This timer is running and will be stopped"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__product_uom_id
-msgid "Unit of Measure"
-msgstr ""
-
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,field_description:project_timesheet_time_control.field_hr_timesheet_switch__user_id
-msgid "User"
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__running_timer_duration
 msgid "When the previous timer is stopped, it will save this duration."
@@ -464,11 +310,6 @@ msgstr ""
 msgid "You have a running timer called"
 msgstr ""
 
-#. module: project_timesheet_time_control
-#: model:ir.model.fields,help:project_timesheet_time_control.field_hr_timesheet_switch__non_allow_billable
-msgid "Your timesheet will not be billed."
-msgstr ""
-
 #. module: project_timesheet_time_control
 #: model_terms:ir.ui.view,arch_db:project_timesheet_time_control.hr_timesheet_switch_form
 msgid "and started at"
diff --git a/project_timesheet_time_control/readme/CONTRIBUTORS.rst b/project_timesheet_time_control/readme/CONTRIBUTORS.rst
index 3592e38d6c..92e1eee5b3 100644
--- a/project_timesheet_time_control/readme/CONTRIBUTORS.rst
+++ b/project_timesheet_time_control/readme/CONTRIBUTORS.rst
@@ -7,3 +7,4 @@
     * Luis M. ontalba
     * Ernesto Tejeda
     * Jairo Llopis
+    * Carlos Roca
diff --git a/project_timesheet_time_control/static/description/index.html b/project_timesheet_time_control/static/description/index.html
index 72cfef7034..ba93652c76 100644
--- a/project_timesheet_time_control/static/description/index.html
+++ b/project_timesheet_time_control/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Project timesheet time control</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Project timesheet time control</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/project/tree/14.0/project_timesheet_time_control"><img alt="OCA/project" src="https://img.shields.io/badge/github-OCA%2Fproject-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_timesheet_time_control"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/140/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/project/tree/15.0/project_timesheet_time_control"><img alt="OCA/project" src="https://img.shields.io/badge/github-OCA%2Fproject-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/project-15-0/project-15-0-project_timesheet_time_control"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/140/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>Allow to track the exact moment when a timesheet line is started (not only
 the day, but also the minute and second) and let users start and stop timers
 easily.</p>
@@ -464,7 +464,7 @@ <h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/project/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/project/issues/new?body=module:%20project_timesheet_time_control%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/project/issues/new?body=module:%20project_timesheet_time_control%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -488,6 +488,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <li>Luis M. ontalba</li>
 <li>Ernesto Tejeda</li>
 <li>Jairo Llopis</li>
+<li>Carlos Roca</li>
 </ul>
 </blockquote>
 </li>
@@ -502,7 +503,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/ernestotejeda"><img alt="ernestotejeda" src="https://github.com/ernestotejeda.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/project/tree/14.0/project_timesheet_time_control">OCA/project</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/project/tree/15.0/project_timesheet_time_control">OCA/project</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/project_timesheet_time_control/tests/test_project_timesheet_time_control.py b/project_timesheet_time_control/tests/test_project_timesheet_time_control.py
index 2445d8e0d3..0d3d7312f3 100644
--- a/project_timesheet_time_control/tests/test_project_timesheet_time_control.py
+++ b/project_timesheet_time_control/tests/test_project_timesheet_time_control.py
@@ -4,7 +4,7 @@
 from datetime import date, datetime, timedelta
 
 from odoo import exceptions
-from odoo.tests import common
+from odoo.tests import Form, common
 from odoo.tools.float_utils import float_compare
 
 
@@ -55,16 +55,15 @@ def _create_wizard(self, action, active_record):
         self.assertEqual(action["type"], "ir.actions.act_window")
         self.assertEqual(action["view_mode"], "form")
         self.assertEqual(action["view_type"], "form")
-        return (
-            active_record.env[action["res_model"]]
-            .with_context(
+        wiz_form = Form(
+            active_record.env[action["res_model"]].with_context(
                 active_id=active_record.id,
                 active_ids=active_record.ids,
                 active_model=active_record._name,
                 **action.get("context", {}),
             )
-            .create({})
         )
+        return wiz_form.save()
 
     def test_aal_from_other_employee_no_button(self):
         """Lines from other employees have no resume/stop button."""
@@ -119,13 +118,8 @@ def test_aal_time_control_flow(self):
         self.assertEqual(self.line.show_time_control, "resume")
         resume_action = self.line.button_resume_work()
         wizard = self._create_wizard(resume_action, self.line)
-        self.assertFalse(wizard.amount)
         self.assertLessEqual(wizard.date_time, datetime.now())
-        self.assertLessEqual(wizard.date, date.today())
-        self.assertFalse(wizard.is_task_closed)
-        self.assertFalse(wizard.unit_amount)
-        self.assertEqual(wizard.account_id, self.line.account_id)
-        self.assertEqual(wizard.employee_id, self.line.employee_id)
+        self.assertEqual(wizard.analytic_line_id, self.line)
         self.assertEqual(wizard.name, self.line.name)
         self.assertEqual(wizard.project_id, self.line.project_id)
         self.assertEqual(wizard.running_timer_id, running_timer)
@@ -185,13 +179,10 @@ def test_project_time_control_flow(self):
         self.assertEqual(self.project.show_time_control, "start")
         start_action = self.project.button_start_work()
         wizard = self._create_wizard(start_action, self.project)
-        self.assertFalse(wizard.amount)
         self.assertLessEqual(wizard.date_time, datetime.now())
-        self.assertLessEqual(wizard.date, date.today())
-        self.assertFalse(wizard.is_task_closed)
-        self.assertFalse(wizard.unit_amount)
-        self.assertEqual(wizard.account_id, self.project.analytic_account_id)
-        self.assertEqual(wizard.employee_id, self.env.user.employee_ids)
+        self.assertEqual(
+            wizard.analytic_line_id.account_id, self.project.analytic_account_id
+        )
         self.assertEqual(wizard.name, "No task here")
         self.assertEqual(wizard.project_id, self.project)
         self.assertFalse(wizard.running_timer_id, self.line)
@@ -219,13 +210,10 @@ def test_task_time_control_flow(self):
         self.assertEqual(self.task.show_time_control, "start")
         start_action = self.task.button_start_work()
         wizard = self._create_wizard(start_action, self.task)
-        self.assertFalse(wizard.amount)
         self.assertLessEqual(wizard.date_time, datetime.now())
-        self.assertLessEqual(wizard.date, date.today())
-        self.assertFalse(wizard.is_task_closed)
-        self.assertFalse(wizard.unit_amount)
-        self.assertEqual(wizard.account_id, self.task.project_id.analytic_account_id)
-        self.assertEqual(wizard.employee_id, self.env.user.employee_ids)
+        self.assertEqual(
+            wizard.analytic_line_id.account_id, self.task.project_id.analytic_account_id
+        )
         self.assertEqual(wizard.name, self.line.name)
         self.assertEqual(wizard.project_id, self.task.project_id)
         self.assertEqual(wizard.task_id, self.task)
diff --git a/project_timesheet_time_control/views/account_analytic_line_view.xml b/project_timesheet_time_control/views/account_analytic_line_view.xml
index 71845bd67a..a984c299ab 100644
--- a/project_timesheet_time_control/views/account_analytic_line_view.xml
+++ b/project_timesheet_time_control/views/account_analytic_line_view.xml
@@ -15,23 +15,21 @@
                 <field name="show_time_control" invisible="1" />
                 <button
                     name="button_resume_work"
-                    string="Resume work"
                     tabindex="-1"
                     type="object"
                     icon="fa-play-circle text-success"
                     attrs="{'invisible': [('show_time_control', '!=', 'resume')]}"
                     class="oe_stat_button"
-                    title="Start work"
+                    title="Resume work"
                 />
                 <button
                     name="button_end_work"
-                    string="Stop work"
                     tabindex="-1"
                     type="object"
                     icon="fa-stop-circle text-warning"
                     attrs="{'invisible': [('show_time_control', '!=', 'stop')]}"
                     class="oe_stat_button"
-                    title="End work"
+                    title="Stop work"
                 />
             </field>
         </field>
@@ -48,22 +46,20 @@
                 <field name="show_time_control" invisible="1" />
                 <button
                     name="button_resume_work"
-                    string="Resume work"
                     type="object"
                     icon="fa-play-circle text-success"
                     attrs="{'invisible': [('show_time_control', '!=', 'resume')]}"
                     class="oe_stat_button"
                     context="{'show_created_timer': True}"
-                    title="Start work"
+                    title="Resume work"
                 />
                 <button
                     name="button_end_work"
-                    string="Stop work"
                     type="object"
                     icon="fa-stop-circle text-warning"
                     attrs="{'invisible': [('show_time_control', '!=', 'stop')]}"
                     class="oe_stat_button"
-                    title="End work"
+                    title="Stop work"
                 />
             </div>
             <field name="date" position="attributes">
diff --git a/project_timesheet_time_control/views/project_task_view.xml b/project_timesheet_time_control/views/project_task_view.xml
index 4ee64ab42a..176399be19 100644
--- a/project_timesheet_time_control/views/project_task_view.xml
+++ b/project_timesheet_time_control/views/project_task_view.xml
@@ -48,7 +48,7 @@
                 <field name="show_time_control" invisible="1" />
                 <button
                     name="button_resume_work"
-                    string="Resume work"
+                    title="Resume work"
                     tabindex="-1"
                     type="object"
                     icon="fa-play-circle text-success"
@@ -57,7 +57,7 @@
                 />
                 <button
                     name="button_end_work"
-                    string="Stop work"
+                    title="Stop work"
                     tabindex="-1"
                     type="object"
                     icon="fa-stop-circle text-warning"
@@ -123,24 +123,22 @@
                     <field name="show_time_control" invisible="1" />
                     <button
                         name="button_resume_work"
-                        string="Resume work"
                         tabindex="-1"
                         type="object"
                         icon="fa-play-circle text-success"
                         attrs="{'invisible': [('show_time_control', '!=', 'resume')]}"
                         class="oe_stat_button"
                         context="{'show_created_timer': True}"
-                        title="Start work"
+                        title="Resume work"
                     />
                     <button
                         name="button_end_work"
-                        string="Stop work"
                         tabindex="-1"
                         type="object"
                         icon="fa-stop-circle text-warning"
                         attrs="{'invisible': [('show_time_control', '!=', 'stop')]}"
                         class="oe_stat_button"
-                        title="End work"
+                        title="Stop work"
                     />
                 </div>
             </xpath>
@@ -161,7 +159,6 @@
                     name="button_start_work"
                     attrs="{'invisible': [('show_time_control', '!=', 'start')]}"
                     class="o_kanban_inline_block fa fa-lg fa-play-circle text-success"
-                    string="Start work"
                     tabindex="-1"
                     type="object"
                     title="Start work"
@@ -170,10 +167,9 @@
                     name="button_end_work"
                     attrs="{'invisible': [('show_time_control', '!=', 'stop')]}"
                     class="o_kanban_inline_block fa fa-lg fa-stop-circle text-warning"
-                    string="Stop work"
                     tabindex="-1"
                     type="object"
-                    title="End work"
+                    title="Stop work"
                 />
             </xpath>
         </field>
diff --git a/project_timesheet_time_control/wizards/hr_timesheet_switch.py b/project_timesheet_time_control/wizards/hr_timesheet_switch.py
index 794c549b74..5774dd39aa 100644
--- a/project_timesheet_time_control/wizards/hr_timesheet_switch.py
+++ b/project_timesheet_time_control/wizards/hr_timesheet_switch.py
@@ -3,13 +3,66 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
+from odoo.osv.expression import expression
 
 
 class HrTimesheetSwitch(models.TransientModel):
     _name = "hr.timesheet.switch"
-    _inherit = "account.analytic.line"
     _description = "Helper to quickly switch between timesheet lines"
 
+    def _domain_project_id(self):
+        domain = [("allow_timesheets", "=", True)]
+        if not self.user_has_groups("hr_timesheet.group_timesheet_manager"):
+            return expression.AND(
+                [
+                    domain,
+                    [
+                        "|",
+                        ("privacy_visibility", "!=", "followers"),
+                        ("message_partner_ids", "in", [self.env.user.partner_id.id]),
+                    ],
+                ]
+            )
+        return domain
+
+    analytic_line_id = fields.Many2one(
+        comodel_name="account.analytic.line", string="Origin line"
+    )
+    name = fields.Char(string="Description", required=True)
+    date_time = fields.Datetime(
+        string="Start Time", default=fields.Datetime.now, required=True
+    )
+    date_time_end = fields.Datetime(string="End Time")
+    task_id = fields.Many2one(
+        comodel_name="project.task",
+        string="Task",
+        compute="_compute_task_id",
+        store=True,
+        readonly=False,
+        index=True,
+        domain="""
+            [
+                ('company_id', '=', company_id),
+                ('project_id.allow_timesheets', '=', True),
+                ('project_id', '=?', project_id)
+            ]
+        """,
+    )
+    project_id = fields.Many2one(
+        comodel_name="project.project",
+        string="Project",
+        compute="_compute_project_id",
+        store=True,
+        readonly=False,
+        domain=_domain_project_id,
+    )
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        required=True,
+        readonly=True,
+        default=lambda self: self.env.company,
+    )
     running_timer_id = fields.Many2one(
         comodel_name="account.analytic.line",
         string="Previous timer",
@@ -28,8 +81,16 @@ class HrTimesheetSwitch(models.TransientModel):
         compute="_compute_running_timer_duration",
         help="When the previous timer is stopped, it will save this duration.",
     )
-    # Redefine the relation to avoid using the same table than parent model
-    tag_ids = fields.Many2many(relation="hr_timesheet_switch_line_tag_rel")
+
+    @api.depends("task_id", "task_id.project_id")
+    def _compute_project_id(self):
+        for line in self.filtered(lambda line: not line.project_id):
+            line.project_id = line.task_id.project_id
+
+    @api.depends("project_id")
+    def _compute_task_id(self):
+        for line in self.filtered(lambda line: not line.project_id):
+            line.task_id = False
 
     @api.model
     def _default_running_timer_id(self, employee=None):
@@ -59,77 +120,64 @@ def _default_running_timer_id(self, employee=None):
     def _compute_running_timer_duration(self):
         """Compute duration of running timer when stopped."""
         for one in self:
-            one.running_timer_duration = one._duration(
-                one.running_timer_id.date_time,
-                one.date_time,
-            )
+            one.running_timer_duration = 0.0
+            if one.running_timer_id:
+                one.running_timer_duration = one.running_timer_id._duration(
+                    one.running_timer_id.date_time,
+                    one.date_time,
+                )
 
     @api.model
     def _closest_suggestion(self):
         """Find most similar account.analytic.line record."""
-        try:
-            active = self.env[self.env.context["active_model"]].browse(
-                self.env.context["active_id"]
-            )
-        except KeyError:
-            # If I don't know where's the user, I don't know what to suggest
-            return self.env["account.analytic.line"].browse()
-        # If you're browsing another account.analytic.line, that's the match
-        if active._name == "account.analytic.line":
-            return active
-        # If browsing other models, prepare a search
+        context = self.env.context
+        model = "account.analytic.line"
         domain = [("employee_id", "in", self.env.user.employee_ids.ids)]
-        if active._name == "project.task":
-            domain.append(("task_id", "=", active.id))
-        elif active._name == "project.project":
+        if context.get("active_model") == model:
+            return self.env[model].browse(context["active_id"])
+        elif context.get("active_model") == "project.task":
+            domain.append(("task_id", "=", context["active_id"]))
+        elif context.get("active_model") == "project.project":
             domain += [
-                ("project_id", "=", active.id),
+                ("project_id", "=", context["active_id"]),
                 ("task_id", "=", False),
             ]
         else:
-            # No clues for other records, sorry
-            return self.env["account.analytic.line"].browse()
+            return self.env[model]
         return self.env["account.analytic.line"].search(
             domain,
             order="date_time DESC",
             limit=1,
         )
 
+    def _prepare_default_values(self, account_analytic_line):
+        return {
+            "analytic_line_id": account_analytic_line.id,
+            "name": account_analytic_line.name,
+            "project_id": account_analytic_line.project_id.id,
+            "task_id": account_analytic_line.task_id.id,
+        }
+
     @api.model
     def default_get(self, fields_list):
         """Return defaults depending on the context where it is called."""
         result = super().default_get(fields_list)
         inherited = self._closest_suggestion()
-        assert inherited._name == "account.analytic.line"
-        # Inherit all possible fields from that account.analytic.line record
         if inherited:
-            # Convert inherited to RPC-style values
-            _fields = set(fields_list) & set(inherited._fields) - {
-                # These fields must always be reset
-                "id",
-                "amount",
-                "date_time",
-                "date_time_end",
-                "date",
-                "is_task_closed",
-                "unit_amount",
-                # This field is from sale_timesheet, which is not among
-                # this module dependencies; ignoring it will let you
-                # resume an invoiced AAL if that module is installed,
-                # and it doesn't hurt here
-                "timesheet_invoice_id",
-                # These fields are from the hr_timesheet_activity_begin_end
-                # module. Unless ignored, these fields will cause a validation
-                # error because time_stop - time_start must equal duration.
-                "time_start",
-                "time_stop",
-            }
-            inherited.read(_fields)
-            values = inherited._convert_to_write(inherited._cache)
-            for field in _fields:
-                result[field] = values[field]
+            result.update(self._prepare_default_values(inherited))
         return result
 
+    def _prepare_copy_values(self, record):
+        """Return the values that will be overwritten in new timesheet entry."""
+        return {
+            "name": record.name,
+            "date_time": record.date_time,
+            "date_time_end": record.date_time_end,
+            "project_id": record.project_id.id,
+            "task_id": record.task_id.id,
+            "unit_amount": 0,
+        }
+
     def action_switch(self):
         """Stop old timer, start new one."""
         self.ensure_one()
@@ -139,12 +187,13 @@ def action_switch(self):
             stop_dt=self.date_time,
         ).running_timer_id.button_end_work()
         # Start new timer
-        _fields = self.env["account.analytic.line"]._fields.keys()
-        self.read(_fields)
-        values = self._convert_to_write(self._cache)
-        new = self.env["account.analytic.line"].create(
-            {field: value for (field, value) in values.items() if field in _fields}
-        )
+        if self.analytic_line_id:
+            new = self.analytic_line_id.copy(self._prepare_copy_values(self))
+        else:
+            fields = self.env["account.analytic.line"]._fields.keys()
+            vals = self.env["account.analytic.line"].default_get(fields)
+            vals.update(self._prepare_copy_values(self))
+            new = self.env["account.analytic.line"].create(vals)
         # Display created timer record if requested
         if self.env.context.get("show_created_timer"):
             form_view = self.env.ref("hr_timesheet.hr_timesheet_line_form")
diff --git a/project_timesheet_time_control/wizards/hr_timesheet_switch_view.xml b/project_timesheet_time_control/wizards/hr_timesheet_switch_view.xml
index 754efaf46a..e9f7579560 100644
--- a/project_timesheet_time_control/wizards/hr_timesheet_switch_view.xml
+++ b/project_timesheet_time_control/wizards/hr_timesheet_switch_view.xml
@@ -6,71 +6,65 @@
     <record id="hr_timesheet_switch_form" model="ir.ui.view">
         <field name="name">hr.timesheet.switch resume form</field>
         <field name="model">hr.timesheet.switch</field>
-        <field name="mode">primary</field>
-        <field name="inherit_id" ref="hr_timesheet_line_form" />
         <field name="arch" type="xml">
-            <!-- Unclutter form -->
-            <div name="button_box" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </div>
-            <field name="amount" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </field>
-            <field name="unit_amount" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </field>
-            <xpath expr="//sheet/group/group" position="attributes">
-                <attribute name="colspan">4</attribute>
-            </xpath>
-            <xpath expr="//group/field[@name='name']" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </xpath>
-            <!-- Display messages -->
-            <xpath expr="//sheet/group" position="after">
-                <group
-                    name="messages"
-                    string="Previous timer"
-                    attrs="{'invisible': [('running_timer_id', '=', False)]}"
-                >
-                    <p>
-                        You have a running timer called
-                        <field
-                            name="running_timer_id"
-                            class="oe_inline"
-                            context="{'form_view_ref': 'hr_timesheet.hr_timesheet_line_form'}"
-                        />
-                        and started at
-                        <field name="running_timer_start" class="oe_inline" />
-                        .
-                        If you continue, it will be stopped with
-                        <strong>
-                            <field
-                                name="running_timer_duration"
-                                class="text-info"
-                                widget="float_time"
-                                attrs="{'invisible': [('running_timer_duration', '&gt;=', 5)]}"
-                            />
+            <form>
+                <sheet>
+                    <div class="oe_title" modifiers="{}">
+                        <label class="oe_edit_only" for="name" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group colspan="4">
+                        <field name="date_time" />
+                        <field name="date_time_end" />
+                        <field name="project_id" required="1" />
+                        <field name="task_id" />
+                        <field name="company_id" />
+                    </group>
+                    <group
+                        name="messages"
+                        string="Previous timer"
+                        attrs="{'invisible': [('running_timer_id', '=', False)]}"
+                    >
+                        <p>
+                            You have a running timer called
                             <field
-                                name="running_timer_duration"
-                                class="text-warning"
-                                widget="float_time"
-                                attrs="{'invisible': [('running_timer_duration', '&lt;', 5)]}"
+                                name="running_timer_id"
+                                class="oe_inline"
+                                context="{'form_view_ref': 'hr_timesheet.hr_timesheet_line_form'}"
                             />
-                            hour(s).
-                        </strong>
-                    </p>
-                    <div
-                        class="alert alert-warning"
-                        colspan="4"
-                        role="alert"
-                        attrs="{'invisible': [('running_timer_duration', '&lt;', 5)]}"
-                    >
-                        That is a lot of time! Make sure it is fine before saving.
-                    </div>
-                </group>
-            </xpath>
-            <!-- Footer buttons -->
-            <sheet position="after">
+                            and started at
+                            <field name="running_timer_start" class="oe_inline" />
+                            .
+                            If you continue, it will be stopped with
+                            <strong>
+                                <field
+                                    name="running_timer_duration"
+                                    class="text-info"
+                                    widget="float_time"
+                                    attrs="{'invisible': [('running_timer_duration', '&gt;=', 5)]}"
+                                />
+                                <field
+                                    name="running_timer_duration"
+                                    class="text-warning"
+                                    widget="float_time"
+                                    attrs="{'invisible': [('running_timer_duration', '&lt;', 5)]}"
+                                />
+                                hour(s).
+                            </strong>
+                        </p>
+                        <div
+                            class="alert alert-warning"
+                            colspan="4"
+                            role="alert"
+                            attrs="{'invisible': [('running_timer_duration', '&lt;', 5)]}"
+                        >
+                            That is a lot of time! Make sure it is fine before saving.
+                        </div>
+                    </group>
+                </sheet>
+                <!-- Footer buttons -->
                 <footer>
                     <button
                         name="action_switch"
@@ -96,7 +90,7 @@
                     />
                     <button special="cancel" string="Cancel" />
                 </footer>
-            </sheet>
+            </form>
         </field>
     </record>
     <record id="hr_timesheet_switch_action" model="ir.actions.act_window">