diff --git a/sale_timesheet_work_entry_rate/views/timesheet_views.xml b/sale_timesheet_work_entry_rate/views/timesheet_views.xml
index 761424bd..8889c43f 100644
--- a/sale_timesheet_work_entry_rate/views/timesheet_views.xml
+++ b/sale_timesheet_work_entry_rate/views/timesheet_views.xml
@@ -7,10 +7,14 @@
         <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='name']" position="before">
-                <field name="work_type_id"/>
+                <field name="work_type_id"
+                       domain="[('allow_timesheet', '=', True)]"
+                       context="{'default_allow_timesheet': True}" />
             </xpath>
             <xpath expr="//field[@name='timesheet_ids']/form//field[@name='name']" position="before">
-                <field name="work_type_id"/>
+                <field name="work_type_id"
+                       domain="[('allow_timesheet', '=', True)]"
+                       context="{'default_allow_timesheet': True}" />
             </xpath>
         </field>
     </record>
diff --git a/timesheet_grid_work_entry/__init__.py b/timesheet_grid_work_entry/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/timesheet_grid_work_entry/__manifest__.py b/timesheet_grid_work_entry/__manifest__.py
new file mode 100755
index 00000000..211695f7
--- /dev/null
+++ b/timesheet_grid_work_entry/__manifest__.py
@@ -0,0 +1,21 @@
+{
+    'name': 'Timesheet Grid Work Entry',
+    'description': 'bridge',
+    'version': '14.0.1.0.0',
+    'website': 'https://hibou.io/',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Human Resources',
+    'depends': [
+        'hr_timesheet_work_entry',
+        'timesheet_grid',
+    ],
+    'data': [
+        'views/timesheet_views.xml',
+    ],
+    'demo': [
+    ],
+    'installable': True,
+    'auto_install': True,
+    'application': False,
+}
diff --git a/timesheet_grid_work_entry/views/timesheet_views.xml b/timesheet_grid_work_entry/views/timesheet_views.xml
new file mode 100644
index 00000000..1c6c2175
--- /dev/null
+++ b/timesheet_grid_work_entry/views/timesheet_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="timesheet_view_form_inherit" model="ir.ui.view">
+        <field name="name">account.analytic.line.form.inherit</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="timesheet_grid.timesheet_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='task_id']" position="after">
+                <field name="work_type_id"
+                       domain="[('allow_timesheet', '=', True)]"
+                       context="{'default_allow_timesheet': True}" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>