diff --git a/hr_timesheet_work_entry/__init__.py b/hr_timesheet_work_entry/__init__.py
index e58c8b0b..b54e0630 100644
--- a/hr_timesheet_work_entry/__init__.py
+++ b/hr_timesheet_work_entry/__init__.py
@@ -1,7 +1,7 @@
 from . import models
 
 
-def ts_work_type_pre_init_hook(cr):
+def ts_work_type_pre_init_hook(env):
     """
     This module installs a Work Entry Type with code "TS"
     If you have undergone a migration (either for this module
@@ -9,7 +9,7 @@ def ts_work_type_pre_init_hook(cr):
     then the uniqueness constraint will prevent this module
     from installing.
     """
-    cr.execute("UPDATE hr_work_entry_type "
+    env.cr.execute("UPDATE hr_work_entry_type "
                "SET code = 'TS-PRE-INSTALL-14' "
                "WHERE code = 'TS';"
                )
diff --git a/hr_timesheet_work_entry/__manifest__.py b/hr_timesheet_work_entry/__manifest__.py
index fdc54d0f..aa4d2007 100755
--- a/hr_timesheet_work_entry/__manifest__.py
+++ b/hr_timesheet_work_entry/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Timesheet Work Entry Type',
     'description': 'Set work types on timesheet records.',
-    'version': '17.0.1.0.0',
+    'version': '18.0.1.0.0',
     'website': 'https://hibou.io/',
     'author': 'Hibou Corp.',
     'license': 'AGPL-3',
diff --git a/hr_timesheet_work_entry/views/timesheet_views.xml b/hr_timesheet_work_entry/views/timesheet_views.xml
index 9ac5d44f..30ec431e 100644
--- a/hr_timesheet_work_entry/views/timesheet_views.xml
+++ b/hr_timesheet_work_entry/views/timesheet_views.xml
@@ -6,7 +6,7 @@
         <field name="model">account.analytic.line</field>
         <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
         <field name="arch" type="xml">
-            <xpath expr="//tree/field[@name='task_id']" position="after">
+            <xpath expr="//list/field[@name='task_id']" position="after">
                 <field name="work_type_id"
                        domain="[('allow_timesheet', '=', True)]"
                        context="{'default_allow_timesheet': True}" />
@@ -32,7 +32,7 @@
         <field name="model">project.task</field>
         <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='timesheet_ids']/tree//field[@name='employee_id']" position="after">
+            <xpath expr="//field[@name='timesheet_ids']/list//field[@name='employee_id']" position="after">
                 <field name="work_type_id"
                        domain="[('allow_timesheet', '=', True)]"
                        context="{'default_allow_timesheet': True}" />