diff --git a/project_working_time_task_portal/views/portal_tasks_list.xml b/project_working_time_task_portal/views/portal_tasks_list.xml
index da6823c..d6febf0 100644
--- a/project_working_time_task_portal/views/portal_tasks_list.xml
+++ b/project_working_time_task_portal/views/portal_tasks_list.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="portal_tasks_list_inherit" inherit_id="project.portal_tasks_list">
-        <xpath expr="//thead/tr/th[7]" position="replace">
-            <th t-if="not is_uom_day" class="text-end">Billable Hours</th>
+    <template id="portal_tasks_list_inherit" inherit_id="hr_timesheet.portal_tasks_list_inherit">
+	<xpath expr="//thead//t[@t-if='not project or project.allow_timesheets']/th[@class='text-end']" position="replace">
+            <th class="text-end">Billable hours</th>
         </xpath>
-        <xpath expr="//tbody/t/tr/td[7]" position="replace">
-            <td class="text-end">
-                <t t-if="not is_uom_day">
+        <xpath expr="//tbody//td[@t-if='not project or project.allow_timesheets']" position="replace">
+            <td t-if="not project or project.allow_timesheets" class="text-end">
+                <t t-if="task.allow_timesheets and not is_uom_day">
                     <span t-field="task.billable_effective_hours"
                         t-options='{"widget": "float_time"}' />
                     <t t-if="task.allocated_hours > 0"> / <span t-field="task.allocated_hours"
@@ -16,4 +16,4 @@
             </td>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>