diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index 51eb66b03ae..8295c7bd025 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -27,6 +27,7 @@ up a management by affair.
         'views/hr_timesheet_views.xml',
         'views/hr_timesheet_config_settings_views.xml',
         'views/project_views.xml',
+        'views/project_portal_templates.xml',
         'report/hr_timesheet_report_view.xml',
         'report/report_timesheet_templates.xml',
         'views/hr_views.xml',
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index 23d20ea4fd4..2a8b9743d2f 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -51,6 +51,21 @@
             <field name="perm_read" eval="1"/>
         </record>
 
+        <record id="timesheet_rule_portal" model="ir.rule">
+            <field name="name">Project/Task Timesheets: frontend access</field>
+            <field name="model_id" ref="analytic.model_account_analytic_line"/>
+            <field name="domain_force">[
+                '|',
+                    '&amp;',
+                        ('task_id.project_id.privacy_visibility', '=', 'portal'),
+                        ('task_id.project_id.message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                    '&amp;',
+                        ('task_id.project_id.privacy_visibility', '=', 'portal'),
+                        ('task_id.message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+            ]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+
     </data>
 
 </odoo>
\ No newline at end of file
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index e9f8ce09b30..661b02a5a3c 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,8 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_line_user,analytic.account.analytic.line.timesheet.user,analytic.model_account_analytic_line,hr_timesheet.group_hr_timesheet_user,1,1,1,1
+access_account_analytic_line_portal,access_timesheets_portal,analytic.model_account_analytic_line,base.group_portal,1,0,0,0
 access_account_analytic_user,analytic.account.analytic.timesheet.user,analytic.model_account_analytic_account,hr_timesheet.group_hr_timesheet_user,1,1,0,0
 access_product_product_user,product.product.timesheet.user,product.model_product_product,hr_timesheet.group_hr_timesheet_user,1,1,1,0
 access_product_template_timesheet_user,product.template.timesheet.user,product.model_product_template,hr_timesheet.group_hr_timesheet_user,1,1,1,0
 access_product_uom_hr_timesheet,product.uom.timesheet.user,product.model_product_uom,hr_timesheet.group_hr_timesheet_user,1,0,0,0
 access_project_project,project.project.timesheet.user,model_project_project,hr_timesheet.group_hr_timesheet_user,1,0,0,0
-access_project_task,project.task.timesheet.user,model_project_task,hr_timesheet.group_hr_timesheet_user,1,1,0,0
\ No newline at end of file
+access_project_task,project.task.timesheet.user,model_project_task,hr_timesheet.group_hr_timesheet_user,1,1,0,0
diff --git a/addons/website_project_timesheet/views/account_analytic_line_templates.xml b/addons/hr_timesheet/views/project_portal_templates.xml
similarity index 90%
rename from addons/website_project_timesheet/views/account_analytic_line_templates.xml
rename to addons/hr_timesheet/views/project_portal_templates.xml
index f48b0739794..cb0ed74e25c 100644
--- a/addons/website_project_timesheet/views/account_analytic_line_templates.xml
+++ b/addons/hr_timesheet/views/project_portal_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="my_task" inherit_id="website_project.my_task" name="Project Task Timesheets">
+    <template id="portal_my_task" inherit_id="project.portal_my_task" name="Portal: My Task with imesheets">
         <xpath expr="//div[hasclass('panel-body')]" position="inside">
             <div class="container" t-if="task.timesheet_ids">
                 <hr/>
diff --git a/addons/website_project_timesheet/__init__.py b/addons/website_project_timesheet/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_project_timesheet/__manifest__.py b/addons/website_project_timesheet/__manifest__.py
deleted file mode 100644
index 7f0bd115857..00000000000
--- a/addons/website_project_timesheet/__manifest__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': 'Timesheet in Website Portal',
-    'category': 'Website',
-    'description': """
-Display Timesheet on Task in the Website Portal
-===============================================
-    """,
-    'depends': ['website_project', 'hr_timesheet'],
-    'data': [
-        'security/ir.model.access.csv',
-        'security/account_analytic_line_security.xml',
-        'views/account_analytic_line_templates.xml',
-    ],
-    'auto_install': True,
-}
diff --git a/addons/website_project_timesheet/i18n/es.po b/addons/website_project_timesheet/i18n/es.po
deleted file mode 100644
index ca790feb0a8..00000000000
--- a/addons/website_project_timesheet/i18n/es.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
-# José Vicente <txusev@gmail.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: José Vicente <txusev@gmail.com>, 2016\n"
-"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "Fecha"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "Descripción"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "Duración"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "Responsable"
diff --git a/addons/website_project_timesheet/i18n/fr.po b/addons/website_project_timesheet/i18n/fr.po
deleted file mode 100644
index 4a51ff23348..00000000000
--- a/addons/website_project_timesheet/i18n/fr.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Olivier Lenoir <olivier.lenoir@free.fr>, 2016
-# Fabien Pinckaers <fp@openerp.com>, 2016
-# Melanie Bernard <mbe@odoo.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: Melanie Bernard <mbe@odoo.com>, 2016\n"
-"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "Date "
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "Description"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "Durée"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "Responsable"
diff --git a/addons/website_project_timesheet/i18n/hu.po b/addons/website_project_timesheet/i18n/hu.po
deleted file mode 100644
index 632dc2121b0..00000000000
--- a/addons/website_project_timesheet/i18n/hu.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# krnkris <krnkris@freemail.hu>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: krnkris <krnkris@freemail.hu>, 2016\n"
-"Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "Dátum"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "Leírás"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "Időtartam"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "Felelős"
diff --git a/addons/website_project_timesheet/i18n/nl.po b/addons/website_project_timesheet/i18n/nl.po
deleted file mode 100644
index f8a4bc48aa4..00000000000
--- a/addons/website_project_timesheet/i18n/nl.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2016\n"
-"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "Datum"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "Tijdsduur"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "Verantwoordelijke"
diff --git a/addons/website_project_timesheet/i18n/pt_BR.po b/addons/website_project_timesheet/i18n/pt_BR.po
deleted file mode 100644
index 3ff2218422a..00000000000
--- a/addons/website_project_timesheet/i18n/pt_BR.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Martin Trigaux <mat@odoo.com>, 2016
-# Mateus Lopes <mateus1@gmail.com>, 2016
-# falexandresilva <falexandresilva@gmail.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: falexandresilva <falexandresilva@gmail.com>, 2016\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "Data"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "Descrição"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "Duração"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "Responsável"
diff --git a/addons/website_project_timesheet/i18n/website_project_timesheet.pot b/addons/website_project_timesheet/i18n/website_project_timesheet.pot
deleted file mode 100644
index b970671dda2..00000000000
--- a/addons/website_project_timesheet/i18n/website_project_timesheet.pot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* website_project_timesheet
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr ""
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr ""
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr ""
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr ""
-
diff --git a/addons/website_project_timesheet/i18n/zh_CN.po b/addons/website_project_timesheet/i18n/zh_CN.po
deleted file mode 100644
index 1fe449d6918..00000000000
--- a/addons/website_project_timesheet/i18n/zh_CN.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * website_project_timesheet
-# 
-# Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# Martin Trigaux <mat@odoo.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2016\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Date"
-msgstr "日期"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Description"
-msgstr "说明"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Duration"
-msgstr "持续时间"
-
-#. module: website_project_timesheet
-#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
-msgid "Responsible"
-msgstr "负责人"
diff --git a/addons/website_project_timesheet/security/account_analytic_line_security.xml b/addons/website_project_timesheet/security/account_analytic_line_security.xml
deleted file mode 100644
index 50849737d05..00000000000
--- a/addons/website_project_timesheet/security/account_analytic_line_security.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="portal_task_timesheet_rule" model="ir.rule">
-            <field name="name">Project/Task Timesheets: frontend access</field>
-            <field name="model_id" ref="analytic.model_account_analytic_line"/>
-            <field name="domain_force">['|',
-                                            '&amp;',
-                                                ('task_id.project_id.privacy_visibility', '=', 'portal'),
-                                                ('task_id.project_id.message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
-                                            '&amp;',
-                                                ('task_id.project_id.privacy_visibility', '=', 'portal'),
-                                                ('task_id.message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
-                                        ]</field>
-            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/website_project_timesheet/security/ir.model.access.csv b/addons/website_project_timesheet/security/ir.model.access.csv
deleted file mode 100644
index 02ea69acb45..00000000000
--- a/addons/website_project_timesheet/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_timesheets_portal,access_timesheets_portal,analytic.model_account_analytic_line,base.group_portal,1,0,0,0