diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 28713b26..879c2d07 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,7 @@
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
+  ^project_workload_capacity/|
   # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
diff --git a/project_workload/README.rst b/project_workload/README.rst
new file mode 100644
index 00000000..edc4e672
--- /dev/null
+++ b/project_workload/README.rst
@@ -0,0 +1,74 @@
+================
+Project Workload
+================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4a176ece35168ce42257a5e9a7415205d47c52fdf0e5c5ebcd5986afc7b180c7
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload
+    :alt: akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+This module allow to manage load and capacity by project and cross project
+Load is managed by week
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Known issues / Roadmap
+======================
+
+TODO
+- in case of manual workload assignation add a check on date
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `akretion/ak-odoo-incubator <https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/project_workload/TODO b/project_workload/TODO
new file mode 100644
index 00000000..47a6496d
--- /dev/null
+++ b/project_workload/TODO
@@ -0,0 +1,4 @@
+- propager les dates des workload depuis la tache
+- avoir une vision du lien "planifié" vs "fait"
+- avoir une vision d'un bilan d'un sprint
+- avoir une vision de sa charge de travail
diff --git a/project_workload/__init__.py b/project_workload/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_workload/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_workload/__manifest__.py b/project_workload/__manifest__.py
new file mode 100644
index 00000000..01f39379
--- /dev/null
+++ b/project_workload/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload",
+    "summary": "Ressource Workload Management",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": [
+        "project_timeline",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "security/project_workload_security.xml",
+        "views/project_task_workload_view.xml",
+        "views/project_task_view.xml",
+        "views/project_project_view.xml",
+        "views/project_task_workload_unit_view.xml",
+        "views/menu_view.xml",
+    ],
+}
diff --git a/project_workload/models/__init__.py b/project_workload/models/__init__.py
new file mode 100644
index 00000000..c84c8cf6
--- /dev/null
+++ b/project_workload/models/__init__.py
@@ -0,0 +1,4 @@
+from . import project_task_workload
+from . import project_workload_unit
+from . import project_project
+from . import project_task
diff --git a/project_workload/models/project_project.py b/project_workload/models/project_project.py
new file mode 100644
index 00000000..811667e0
--- /dev/null
+++ b/project_workload/models/project_project.py
@@ -0,0 +1,12 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProjectProject(models.Model):
+    _inherit = "project.project"
+
+    use_workload = fields.Boolean()
diff --git a/project_workload/models/project_task.py b/project_workload/models/project_task.py
new file mode 100644
index 00000000..80f8ac16
--- /dev/null
+++ b/project_workload/models/project_task.py
@@ -0,0 +1,104 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    workload_ids = fields.One2many(
+        "project.task.workload",
+        "task_id",
+        "Task",
+        compute="_compute_workload_ids",
+        store=True,
+    )
+    workload_unit_ids = fields.One2many(
+        "project.workload.unit",
+        compute="_compute_workload_unit_ids",
+        string="Workload Units",
+    )
+    use_workload = fields.Boolean(related="project_id.use_workload")
+    config_workload_manually = fields.Boolean()
+
+    @api.depends(
+        "planned_date_start",
+        "planned_date_end",
+        "planned_hours",
+        "user_ids",
+        "config_workload_manually",
+        "use_workload",
+    )
+    def _compute_workload_ids(self):
+        for record in self:
+            if not record.use_workload:
+                continue
+
+            # Handle only automatic config in planned task
+            if record.config_workload_manually or not (
+                record.planned_date_start
+                and record.planned_date_end
+                and record.planned_hours
+            ):
+                continue
+            record.workload_ids = record._get_workload_sync()
+
+    def _prepare_workload(self, user, **extra):
+        return {
+            "date_start": self.planned_date_start,
+            "date_end": self.planned_date_end,
+            "hours": self.planned_hours,
+            "user_id": user.id,
+            **extra,
+        }
+
+    def _get_workload_sync(self):
+        self.ensure_one()
+        return [
+            *[(0, 0, vals) for vals in self._get_new_workloads()],
+            *[
+                (1, workload.id, vals)
+                for workload, vals in self._get_updated_workloads()
+            ],
+            *[(2, workload.id) for workload in self._get_obsolete_workloads()],
+        ]
+
+    def _get_main_workloads(self):
+        return self.workload_ids
+
+    def _get_new_workloads(self):
+        self.ensure_one()
+        workloads = self._get_main_workloads()
+        # Handle only one workload per user in automatic
+        new_vals = []
+        for user in self.user_ids:
+            user_workload = workloads.filtered(lambda w: w.user_id == user)
+            if not user_workload:
+                new_vals.append(self._prepare_workload(user))
+
+        return new_vals
+
+    def _get_updated_workloads(self):
+        self.ensure_one()
+        workloads = self._get_main_workloads()
+        vals = []
+        # Update the users workload values
+        for workload in workloads:
+            if workload.user_id in self.user_ids:
+                vals.append((workload, self._prepare_workload(workload.user_id)))
+        return vals
+
+    def _get_obsolete_workloads(self):
+        self.ensure_one()
+        workloads = self._get_main_workloads()
+        # Remove other workloads, dedup for users?
+        return workloads.filtered(lambda w: w.user_id not in self.user_ids)
+
+    @api.depends("workload_ids.unit_ids")
+    def _compute_workload_unit_ids(self):
+        # related doesn't retrieve all the data so we need to compute it
+        for record in self:
+            record.workload_unit_ids = record.workload_ids.unit_ids
diff --git a/project_workload/models/project_task_workload.py b/project_workload/models/project_task_workload.py
new file mode 100644
index 00000000..3256dac0
--- /dev/null
+++ b/project_workload/models/project_task_workload.py
@@ -0,0 +1,121 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+import re
+from datetime import timedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+WEEK_FORMAT = "%Y-%W"
+
+
+def week_name(value):
+    if value:
+        return value.strftime(WEEK_FORMAT)
+    return None
+
+
+week_merge_re = re.compile(r"(\d{4})-(\d{2}) - (\1)-(\d{2})")
+
+
+class ProjectTaskWorkload(models.Model):
+    _name = "project.task.workload"
+    _description = "Project Task Workload"
+
+    project_id = fields.Many2one(
+        "project.project", "Project", related="task_id.project_id", store=True
+    )
+    task_id = fields.Many2one("project.task", "Task", required=True)
+    date_start = fields.Date(required=True)
+    date_end = fields.Date(required=True)
+    user_id = fields.Many2one("res.users", "User", required=True)
+    hours = fields.Float(required=True)
+    unit_ids = fields.One2many(
+        "project.workload.unit",
+        "workload_id",
+        string="Units",
+        compute="_compute_unit_ids",
+        store=True,
+    )
+
+    @api.constrains("date_start", "date_end")
+    def _check_end_date(self):
+        for load in self:
+            if load.date_end < load.date_start:
+                raise ValidationError(
+                    _("The end date cannot be earlier than the start date.")
+                )
+
+    @api.depends("date_start", "date_end", "hours", "user_id")
+    def _compute_unit_ids(self):
+        for record in self:
+            # We need to have the data to compute the unit (this happens at create)
+            if not record.date_start or not record.date_end or not record.hours:
+                continue
+            record._check_end_date()
+            hours_per_week = record._get_hours_per_week()
+            unit_per_week = {wl.week: wl for wl in record.unit_ids}
+            commands = []
+            for week, hours in hours_per_week.items():
+                unit = unit_per_week.get(week)
+                if unit:
+                    if unit.hours != hours:
+                        # Update unit
+                        commands.append((1, unit.id, {"hours": hours}))
+                else:
+                    # Create unit
+                    commands.append(
+                        (
+                            0,
+                            0,
+                            {
+                                # We have to set here the value of user_id
+                                # as related field user_id will be not computed
+                                # The "project.workload" are created from the computed
+                                # field "workload_ids" and odoo do not play the compute
+                                # field when there are trigered inside a create
+                                # that come from a compute
+                                "user_id": record.user_id.id,
+                                "hours": hours,
+                                "week": week,
+                            },
+                        )
+                    )
+            for week, unit in unit_per_week.items():
+                if week not in hours_per_week:
+                    # Remove not in week anymore unit
+                    commands.append((2, unit.id))
+
+            record.unit_ids = commands
+
+    def _get_hours_per_week(self):
+        weeks = set()
+        date = self.date_start
+        while True:
+            weeks.add(week_name(date))
+            date += timedelta(days=7)
+            if date > self.date_end:
+                break
+        # For now a simple stupid split is done by week
+        # we do not care of the exact start / stop date
+        hours = self.hours / len(weeks)
+        return {week: hours for week in weeks}
+
+    def name_get(self):
+        result = []
+        for load in self:
+            if not load.date_start or not load.date_end:
+                continue
+            week_start = week_name(load.date_start)
+            end = load.date_end
+            if load.date_start.weekday() > load.date_end.weekday():
+                end -= timedelta(days=7)
+            week_end = week_name(end)
+            name = f"{load.task_id.name}: {week_start}"
+            if week_end > week_start:
+                name += f" - {week_end}"
+                name = week_merge_re.sub(r"\1-\2->\4", name)
+            result.append((load.id, name))
+        return result
diff --git a/project_workload/models/project_workload_unit.py b/project_workload/models/project_workload_unit.py
new file mode 100644
index 00000000..85ee05c0
--- /dev/null
+++ b/project_workload/models/project_workload_unit.py
@@ -0,0 +1,46 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProjectWorkloadUnit(models.Model):
+    _name = "project.workload.unit"
+    _description = "Project Workload Unit"
+
+    week = fields.Char()
+    workload_id = fields.Many2one("project.task.workload", "Workload")
+    hours = fields.Float()
+    user_id = fields.Many2one(
+        "res.users", "User", related="workload_id.user_id", store=True
+    )
+    task_id = fields.Many2one("project.task", "Task", related="workload_id.task_id")
+    project_id = fields.Many2one(
+        "project.project",
+        "Project",
+        related="workload_id.project_id",
+        store=True,
+    )
+    done = fields.Boolean(compute="_compute_done", store=True)
+
+    def is_done(self):
+        self.ensure_one()
+        return self.task_id.is_closed
+
+    @api.depends("task_id.is_closed")
+    def _compute_done(self):
+        for record in self:
+            record.done = record.is_done()
+
+    def name_get(self):
+        result = []
+        for unit in self:
+            result.append(
+                (
+                    unit.id,
+                    "%s: %s" % (unit.task_id.name, unit.week),
+                )
+            )
+        return result
diff --git a/project_workload/readme/CONTRIBUTORS.rst b/project_workload/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..292f457e
--- /dev/null
+++ b/project_workload/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
diff --git a/project_workload/readme/DESCRIPTION.rst b/project_workload/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..ffb22876
--- /dev/null
+++ b/project_workload/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module allow to manage load and capacity by project and cross project
+Load is managed by week
diff --git a/project_workload/readme/ROADMAP.rst b/project_workload/readme/ROADMAP.rst
new file mode 100644
index 00000000..dd00217e
--- /dev/null
+++ b/project_workload/readme/ROADMAP.rst
@@ -0,0 +1,2 @@
+TODO
+- in case of manual workload assignation add a check on date
diff --git a/project_workload/security/ir.model.access.csv b/project_workload/security/ir.model.access.csv
new file mode 100644
index 00000000..c4407e5b
--- /dev/null
+++ b/project_workload/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_edit_project_task_workload,edit project task workload,model_project_task_workload,project.group_project_user,1,1,1,1
+access_edit_project_workload_unit,edit project workload unit,model_project_workload_unit,project.group_project_user,1,1,1,1
diff --git a/project_workload/security/project_workload_security.xml b/project_workload/security/project_workload_security.xml
new file mode 100644
index 00000000..b26828e1
--- /dev/null
+++ b/project_workload/security/project_workload_security.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+  <record id="group_project_workload" model="res.groups">
+    <field name="name">Show Project Workload</field>
+    <field name="category_id" ref="base.module_category_hidden" />
+  </record>
+
+  <record model="res.users" id="base.user_root">
+    <field
+            eval="[(4,ref('project_workload.group_project_workload'))]"
+            name="groups_id"
+        />
+  </record>
+
+  <record model="res.users" id="base.user_admin">
+    <field
+            eval="[(4,ref('project_workload.group_project_workload'))]"
+            name="groups_id"
+        />
+  </record>
+
+</odoo>
diff --git a/project_workload/static/description/index.html b/project_workload/static/description/index.html
new file mode 100644
index 00000000..32f90189
--- /dev/null
+++ b/project_workload/static/description/index.html
@@ -0,0 +1,431 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Project Workload</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="project-workload">
+<h1 class="title">Project Workload</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4a176ece35168ce42257a5e9a7415205d47c52fdf0e5c5ebcd5986afc7b180c7
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload"><img alt="akretion/ak-odoo-incubator" src="https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github" /></a></p>
+<p>This module allow to manage load and capacity by project and cross project
+Load is managed by week</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-1">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1>
+<p>TODO
+- in case of manual workload assignation add a check on date</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload%0Aversion:%2016.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">
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:
+* BEAU Sébastien &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;
+* Florian Mounier &lt;<a class="reference external" href="mailto:florian.mounier&#64;akretion.com">florian.mounier&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload">akretion/ak-odoo-incubator</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/project_workload/tests/__init__.py b/project_workload/tests/__init__.py
new file mode 100644
index 00000000..5c9b38db
--- /dev/null
+++ b/project_workload/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_workload
diff --git a/project_workload/tests/common.py b/project_workload/tests/common.py
new file mode 100644
index 00000000..b96bf3c7
--- /dev/null
+++ b/project_workload/tests/common.py
@@ -0,0 +1,31 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from freezegun import freeze_time
+
+from odoo.tests import TransactionCase
+
+
+@freeze_time("2023-07-24")
+class TestWorkloadCommon(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.project = cls.env["project.project"].create(
+            {
+                "name": "Project 1",
+                "use_workload": True,
+            }
+        )
+        cls.user_1 = cls.env.ref("base.demo_user0")
+        cls.user_2 = cls.env.ref("base.user_demo")
+        cls.project_filter = cls.env["ir.filters"].create(
+            {
+                "name": "Project Filter 1",
+                "domain": [("id", "=", cls.project.id)],
+                "model_id": "project.project",
+            }
+        )
diff --git a/project_workload/tests/test_workload.py b/project_workload/tests/test_workload.py
new file mode 100644
index 00000000..f3a0bbbf
--- /dev/null
+++ b/project_workload/tests/test_workload.py
@@ -0,0 +1,68 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo.addons.project_workload.tests.common import TestWorkloadCommon
+
+
+class TestWorkload(TestWorkloadCommon):
+    def _create_task(self):
+        now = datetime.now()
+        return self.env["project.task"].create(
+            {
+                "name": "Task 1",
+                "project_id": self.project.id,
+                "user_ids": [(4, self.user_1.id)],
+                "planned_date_start": now,
+                "planned_date_end": now + timedelta(days=20),
+                "planned_hours": 21,
+            }
+        )
+
+    def test_task_assign_with_hours(self):
+        task = self._create_task()
+        workload = task.workload_ids
+        self.assertEqual(len(workload), 1)
+        self.assertEqual(workload.date_start, task.planned_date_start.date())
+        self.assertEqual(workload.date_end, task.planned_date_end.date())
+        self.assertEqual(workload.hours, 21)
+        load_unit = workload.unit_ids
+        self.assertEqual(len(load_unit), 3)
+        self.assertEqual(load_unit.user_id, self.user_1)
+        self.assertEqual(set(load_unit.mapped("hours")), {7})
+
+    def test_change_user(self):
+        task = self._create_task()
+        task.user_ids = [(6, 0, [self.user_2.id])]
+        self.assertEqual(task.workload_ids.user_id, self.user_2)
+        self.assertEqual(task.workload_ids.unit_ids.user_id, self.user_2)
+
+    def test_add_user(self):
+        task = self._create_task()
+        task.user_ids = [(4, self.user_2.id)]
+        self.assertEqual(len(task.workload_ids), 2)
+        self.assertEqual(task.workload_ids.mapped("user_id"), self.user_1 + self.user_2)
+        self.assertEqual(
+            task.workload_ids.unit_ids.mapped("user_id"), self.user_1 + self.user_2
+        )
+
+    def test_remove_user(self):
+        task = self._create_task()
+        task.user_ids = [(5, 0, 0)]
+        self.assertFalse(task.workload_ids)
+
+    def test_change_date(self):
+        task = self._create_task()
+        task.planned_date_end = task.planned_date_start + timedelta(days=13)
+        workload = task.workload_ids
+        self.assertEqual(len(workload), 1)
+        self.assertEqual(workload.date_start, task.planned_date_start.date())
+        self.assertEqual(workload.date_end, task.planned_date_end.date())
+        self.assertEqual(workload.hours, 21)
+        load_unit = workload.unit_ids
+        self.assertEqual(len(load_unit), 2)
+        self.assertEqual(load_unit.user_id, self.user_1)
+        self.assertEqual(set(load_unit.mapped("hours")), {10.5})
diff --git a/project_workload/views/menu_view.xml b/project_workload/views/menu_view.xml
new file mode 100644
index 00000000..cd58d3c8
--- /dev/null
+++ b/project_workload/views/menu_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <menuitem
+        id="project_workload_menu"
+        parent="project.menu_main_pm"
+        sequence="20"
+        name="Workload"
+        groups="project_workload.group_project_workload"
+    />
+
+    <menuitem
+        id="project_task_workload_menu"
+        name="Workload"
+        parent="project_workload.project_workload_menu"
+        sequence="10"
+        action="project_workload_unit_action"
+    />
+
+</odoo>
diff --git a/project_workload/views/project_project_view.xml b/project_workload/views/project_project_view.xml
new file mode 100644
index 00000000..6d4e1104
--- /dev/null
+++ b/project_workload/views/project_project_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="edit_project" model="ir.ui.view">
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project" />
+        <field name="arch" type="xml">
+            <group name="extra_settings" position="inside">
+                <group name="workload" string="Workloads">
+                    <field
+                        name="use_workload"
+                        groups="project_workload.group_project_workload"
+                    />
+                </group>
+            </group>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload/views/project_task_view.xml b/project_workload/views/project_task_view.xml
new file mode 100644
index 00000000..b8339fee
--- /dev/null
+++ b/project_workload/views/project_task_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_task_form2" model="ir.ui.view">
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page
+                    name="workload"
+                    string="Workload Details"
+                    groups="project_workload.group_project_workload"
+                    attrs="{'invisible': [('use_workload', '=', False)]}"
+                >
+                    <group>
+                        <group>
+                            <field name="use_workload" invisible="1" />
+                            <field name="config_workload_manually" />
+                        </group>
+                        <field
+                            name="workload_ids"
+                            attrs="{'readonly': [('config_workload_manually', '=', False)]}"
+                        >
+                            <tree editable="bottom">
+                                <field name="date_start" />
+                                <field name="date_end" />
+                                <field name="user_id" />
+                                <field name="hours" />
+                            </tree>
+                        </field>
+                        <field name="workload_unit_ids" groups="base.group_no_one">
+                            <tree>
+                                <field name="week" />
+                                <field name="workload_id" />
+                                <field name="user_id" />
+                                <field name="hours" />
+                            </tree>
+                        </field>
+                    </group>
+                </page>
+            </notebook>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload/views/project_task_workload_unit_view.xml b/project_workload/views/project_task_workload_unit_view.xml
new file mode 100644
index 00000000..932aebe4
--- /dev/null
+++ b/project_workload/views/project_task_workload_unit_view.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_workload_unit_view_tree" model="ir.ui.view">
+        <field name="model">project.workload.unit</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="week" />
+                <field name="user_id" />
+                <field name="hours" />
+                <field name="project_id" />
+                <field name="task_id" optional="hide" />
+                <field name="workload_id" optional="hide" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_workload_unit_view_search" model="ir.ui.view">
+        <field name="model">project.workload.unit</field>
+        <field name="arch" type="xml">
+            <search string="Workload">
+                <field name="week" />
+                <field name="user_id" />
+                <field name="project_id" />
+                <filter
+                    string="My load"
+                    name="my_load"
+                    domain="[('user_id', '=', uid), ('done', '=', False)]"
+                />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Week"
+                        name="groupby_week"
+                        domain="[]"
+                        context="{'group_by': 'week'}"
+                    />
+                    <filter
+                        string="User"
+                        name="groupby_user"
+                        domain="[]"
+                        context="{'group_by': 'user_id'}"
+                    />
+                    <filter
+                        string="Project"
+                        name="groupby_project"
+                        domain="[]"
+                        context="{'group_by': 'project_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="project_workload_unit_action">
+        <field name="name">Workload</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.workload.unit</field>
+        <field name="view_mode">tree</field>
+        <field name="search_view_id" ref="project_workload_unit_view_search" />
+        <field name="domain">[]</field>
+        <field
+            name="context"
+        >{'search_default_my_load': 1, 'search_default_groupby_week': 1}</field>
+    </record>
+
+</odoo>
diff --git a/project_workload/views/project_task_workload_view.xml b/project_workload/views/project_task_workload_view.xml
new file mode 100644
index 00000000..c8d591b6
--- /dev/null
+++ b/project_workload/views/project_task_workload_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_task_workload_view_form" model="ir.ui.view">
+        <field name="model">project.task.workload</field>
+        <field name="name">project.task.workload.form</field>
+        <field name="arch" type="xml">
+            <form string="Workload">
+                <group>
+                    <group>
+                        <field name="date_start" />
+                        <field name="date_end" />
+                        <field name="user_id" />
+                    </group>
+                    <field name="unit_ids">
+                        <tree>
+                            <field name="week" />
+                            <field name="hours" />
+                        </tree>
+                    </field>
+                </group>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload_additions/README.rst b/project_workload_additions/README.rst
new file mode 100644
index 00000000..0c0898ce
--- /dev/null
+++ b/project_workload_additions/README.rst
@@ -0,0 +1,67 @@
+==========================
+Project Workload Additions
+==========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f160d5c351f92880cfcdf26467249bc9d536b0509cb5f7b8a93c574eeac84591
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_additions
+    :alt: akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+This module adds additional workloads in tasks.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_additions%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `akretion/ak-odoo-incubator <https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_additions>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/project_workload_additions/__init__.py b/project_workload_additions/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_workload_additions/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_workload_additions/__manifest__.py b/project_workload_additions/__manifest__.py
new file mode 100644
index 00000000..31c5ecb0
--- /dev/null
+++ b/project_workload_additions/__manifest__.py
@@ -0,0 +1,26 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload Additions",
+    "summary": "Automatically add extra load to tasks.",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": [
+        "project_workload",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/project_project_view.xml",
+        "views/project_task_view.xml",
+        "views/project_task_workload_addition_type_views.xml",
+        "views/project_task_workload_view.xml",
+        "views/menu_view.xml",
+    ],
+}
diff --git a/project_workload_additions/models/__init__.py b/project_workload_additions/models/__init__.py
new file mode 100644
index 00000000..e90110a3
--- /dev/null
+++ b/project_workload_additions/models/__init__.py
@@ -0,0 +1,6 @@
+from . import project_project
+from . import project_task_workload
+from . import project_workload_unit
+from . import project_task
+from . import project_task_workload_addition_type
+from . import project_task_workload_addition
diff --git a/project_workload_additions/models/project_project.py b/project_workload_additions/models/project_project.py
new file mode 100644
index 00000000..dbe054e0
--- /dev/null
+++ b/project_workload_additions/models/project_project.py
@@ -0,0 +1,14 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProjectProject(models.Model):
+    _inherit = "project.project"
+
+    additional_workload_ids = fields.One2many(
+        "project.task.workload.addition", "project_id", "Additional Workload"
+    )
diff --git a/project_workload_additions/models/project_task.py b/project_workload_additions/models/project_task.py
new file mode 100644
index 00000000..319447d2
--- /dev/null
+++ b/project_workload_additions/models/project_task.py
@@ -0,0 +1,51 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    def _get_main_workloads(self):
+        return (
+            super()
+            ._get_main_workloads()
+            .filtered(lambda s: not s.additional_workload_id)
+        )
+
+    def _get_new_workloads(self):
+        rv = super()._get_new_workloads()
+        for additional_workload in self.project_id.additional_workload_ids:
+            if additional_workload not in self.workload_ids.additional_workload_id:
+                rv.append(self._prepare_additional_workload(additional_workload))
+        return rv
+
+    def _get_updated_workloads(self):
+        rv = super()._get_updated_workloads()
+        for workload in self.workload_ids:
+            additional_workload = workload.additional_workload_id
+            if additional_workload in self.project_id.additional_workload_ids:
+                rv.append(
+                    (workload, self._prepare_additional_workload(additional_workload))
+                )
+        return rv
+
+    def _get_obsolete_workloads(self):
+        rv = super()._get_obsolete_workloads()
+        for workload in self.workload_ids:
+            additional_workload = workload.additional_workload_id
+            if additional_workload and (
+                additional_workload not in self.project_id.additional_workload_ids
+            ):
+                rv |= workload
+        return rv
+
+    def _prepare_additional_workload(self, additional_workload, **extra):
+        return self._prepare_workload(
+            additional_workload.user_id,
+            additional_workload_id=additional_workload.id,
+            hours=additional_workload._compute_hours_from_task(self),
+            **extra,
+        )
diff --git a/project_workload_additions/models/project_task_workload.py b/project_workload_additions/models/project_task_workload.py
new file mode 100644
index 00000000..cf59742e
--- /dev/null
+++ b/project_workload_additions/models/project_task_workload.py
@@ -0,0 +1,18 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from odoo import fields, models
+
+
+class ProjectTaskWorkload(models.Model):
+    _inherit = "project.task.workload"
+
+    additional_workload_id = fields.Many2one(
+        "project.task.workload.addition", string="Additional Workload Reference"
+    )
+
+    additional_workload_task_id = fields.Many2one(
+        related="additional_workload_id.task_id", string="Additional Workload Task"
+    )
diff --git a/project_workload_additions/models/project_task_workload_addition.py b/project_workload_additions/models/project_task_workload_addition.py
new file mode 100644
index 00000000..75652c0c
--- /dev/null
+++ b/project_workload_additions/models/project_task_workload_addition.py
@@ -0,0 +1,49 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+
+
+class ProjectWorkloadAddition(models.Model):
+    _name = "project.task.workload.addition"
+    _description = "Project Task Workload Addition"
+
+    project_id = fields.Many2one("project.project", string="Project", required=True)
+    type_id = fields.Many2one(
+        "project.task.workload.addition.type", string="Addition Type", required=True
+    )
+    percentage = fields.Float(
+        required=True,
+        string="Added Percentage",
+        store=True,
+        compute="_compute_percentage",
+        readonly=False,
+        precompute=True,
+    )
+    user_id = fields.Many2one("res.users", string="User", required=True)
+    task_id = fields.Many2one("project.task", string="Task", required=True)
+
+    @api.depends("type_id")
+    def _compute_percentage(self):
+        for record in self:
+            record.percentage = record.type_id.default_percentage
+
+    def _compute_hours_from_task(self, task):
+        self.ensure_one()
+        return task.planned_hours * (self.percentage / 100)
+
+    def name_get(self):
+        result = []
+        for record in self:
+            result.append(
+                (
+                    record.id,
+                    _("%(task)s additional workload (%(percentage)d%%)")
+                    % {
+                        "task": record.task_id.name,
+                        "percentage": record.percentage,
+                    },
+                )
+            )
+        return result
diff --git a/project_workload_additions/models/project_task_workload_addition_type.py b/project_workload_additions/models/project_task_workload_addition_type.py
new file mode 100644
index 00000000..674a82b4
--- /dev/null
+++ b/project_workload_additions/models/project_task_workload_addition_type.py
@@ -0,0 +1,16 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from odoo import fields, models
+
+
+class ProjectWorkloadAdditionType(models.Model):
+    _name = "project.task.workload.addition.type"
+    _description = "Project Task Workload Addition Type"
+
+    name = fields.Char(required=True)
+    description = fields.Text()
+    default_percentage = fields.Float(required=True, default=10)
+    active = fields.Boolean(default=True)
diff --git a/project_workload_additions/models/project_workload_unit.py b/project_workload_additions/models/project_workload_unit.py
new file mode 100644
index 00000000..34e21f89
--- /dev/null
+++ b/project_workload_additions/models/project_workload_unit.py
@@ -0,0 +1,22 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, models
+
+
+class ProjectWorkloadUnit(models.Model):
+    _inherit = "project.workload.unit"
+
+    def name_get(self):
+        result = super().name_get()
+        units_names = dict(result)
+        for unit_id, name in result:
+            unit = self.browse(unit_id)
+            if unit.workload_id.additional_workload_id:
+                name = f"{unit.workload_id.additional_workload_id.task_id.name} "
+                f"{_('of')} {name}"
+                units_names[unit_id] = name
+
+        return list(units_names.items())
diff --git a/project_workload_additions/readme/CONTRIBUTORS.rst b/project_workload_additions/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..292f457e
--- /dev/null
+++ b/project_workload_additions/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
diff --git a/project_workload_additions/readme/DESCRIPTION.rst b/project_workload_additions/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..fb3e4465
--- /dev/null
+++ b/project_workload_additions/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module adds additional workloads in tasks.
diff --git a/project_workload_additions/security/ir.model.access.csv b/project_workload_additions/security/ir.model.access.csv
new file mode 100644
index 00000000..23f0d227
--- /dev/null
+++ b/project_workload_additions/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_edit_project_task_workload_addition,edit project task workload addition,model_project_task_workload_addition,project.group_project_user,1,1,1,1
+access_edit_project_task_workload_addition_type,edit project task workload addition type,model_project_task_workload_addition_type,project.group_project_user,1,1,1,1
diff --git a/project_workload_additions/static/description/index.html b/project_workload_additions/static/description/index.html
new file mode 100644
index 00000000..531b235a
--- /dev/null
+++ b/project_workload_additions/static/description/index.html
@@ -0,0 +1,424 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Project Workload Additions</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="project-workload-additions">
+<h1 class="title">Project Workload Additions</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:f160d5c351f92880cfcdf26467249bc9d536b0509cb5f7b8a93c574eeac84591
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_additions"><img alt="akretion/ak-odoo-incubator" src="https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github" /></a></p>
+<p>This module adds additional workloads in tasks.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_additions%0Aversion:%2016.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">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:
+* BEAU Sébastien &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;
+* Florian Mounier &lt;<a class="reference external" href="mailto:florian.mounier&#64;akretion.com">florian.mounier&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_additions">akretion/ak-odoo-incubator</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/project_workload_additions/tests/__init__.py b/project_workload_additions/tests/__init__.py
new file mode 100644
index 00000000..faed57e5
--- /dev/null
+++ b/project_workload_additions/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_workload_addition
diff --git a/project_workload_additions/tests/test_workload_addition.py b/project_workload_additions/tests/test_workload_addition.py
new file mode 100644
index 00000000..f3f3ef69
--- /dev/null
+++ b/project_workload_additions/tests/test_workload_addition.py
@@ -0,0 +1,159 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo.addons.project_workload.tests.common import TestWorkloadCommon
+
+
+class TestWorkload(TestWorkloadCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.task_management, cls.task_review = cls.env["project.task"].create(
+            [
+                {"name": "Management", "project_id": cls.project.id},
+                {"name": "Review", "project_id": cls.project.id},
+            ]
+        )
+        cls.type_management, cls.type_review = cls.env[
+            "project.task.workload.addition.type"
+        ].create(
+            [
+                {"name": "Management", "default_percentage": 15},
+                {"name": "Review", "default_percentage": 20},
+            ]
+        )
+        cls.add_work_management, cls.add_work_review = cls.env[
+            "project.task.workload.addition"
+        ].create(
+            [
+                {
+                    "project_id": cls.project.id,
+                    "type_id": cls.type_management.id,
+                    "user_id": cls.user_1.id,
+                    "task_id": cls.task_management.id,
+                },
+                {
+                    "project_id": cls.project.id,
+                    "type_id": cls.type_review.id,
+                    "user_id": cls.user_2.id,
+                    "task_id": cls.task_review.id,
+                },
+            ]
+        )
+
+    def _create_task(self, user_ids=None):
+        now = datetime.now()
+        return self.env["project.task"].create(
+            {
+                "name": "Task 1",
+                "project_id": self.project.id,
+                "user_ids": [(6, 0, user_ids.ids)] if user_ids else [],
+                "planned_date_start": now,
+                "planned_date_end": now + timedelta(days=20),
+                "planned_hours": 21,
+            }
+        )
+
+    def test_task_assign_with_hours(self):
+        task = self._create_task(self.user_1)
+        workloads = task.workload_ids
+
+        self.assertEqual(len(workloads), 3)
+        workload, workload_management, workload_review = workloads
+
+        self.assertEqual(workload.date_start, task.planned_date_start.date())
+        self.assertEqual(workload.date_end, task.planned_date_end.date())
+        self.assertEqual(workload.user_id, self.user_1)
+        self.assertFalse(workload.additional_workload_id)
+
+        self.assertEqual(workload_management.date_start, task.planned_date_start.date())
+        self.assertEqual(workload_management.date_end, task.planned_date_end.date())
+        self.assertEqual(workload_management.hours, 3.15)
+        self.assertEqual(workload_management.user_id, self.user_1)
+        self.assertEqual(
+            workload_management.additional_workload_id, self.add_work_management
+        )
+
+        self.assertEqual(workload_review.date_start, task.planned_date_start.date())
+        self.assertEqual(workload_review.date_end, task.planned_date_end.date())
+        self.assertEqual(workload_review.hours, 4.2)
+        self.assertEqual(workload_review.user_id, self.user_2)
+        self.assertEqual(workload_review.additional_workload_id, self.add_work_review)
+
+    def _assert_only_additionnal_workload(self, workloads):
+        self.assertEqual(len(workloads), 2)
+        workload_management, workload_review = workloads
+        self.assertEqual(
+            workload_management.additional_workload_id, self.add_work_management
+        )
+        self.assertEqual(workload_review.additional_workload_id, self.add_work_review)
+
+    def test_create_unasign_task(self):
+        task = self._create_task()
+        self._assert_only_additionnal_workload(task.workload_ids)
+
+    def test_remove_user(self):
+        task = self._create_task(self.user_1)
+        task.user_ids = [(5, 0, 0)]
+        self._assert_only_additionnal_workload(task.workload_ids)
+
+    def test_remove_users(self):
+        task = self._create_task(self.user_1 | self.user_2)
+        task.user_ids = [(5, 0, 0)]
+        self._assert_only_additionnal_workload(task.workload_ids)
+
+    def test_update_hours(self):
+        task = self._create_task(self.user_1)
+        task.planned_hours = 42
+        self.assertEqual(len(task.workload_ids), 3)
+        workload, workload_management, workload_review = task.workload_ids
+        self.assertEqual(workload_management.hours, 6.30)
+        self.assertEqual(workload_review.hours, 8.4)
+
+    def test_task_assign_with_hours_and_multiple_users(self):
+        task = self._create_task(self.user_1 | self.user_2)
+        workloads = task.workload_ids
+
+        self.assertEqual(len(workloads), 4)
+        (
+            workload_user_1,
+            workload_user_2,
+            workload_management_user_1,
+            workload_review_user_2,
+        ) = workloads
+
+        self.assertEqual(workload_user_1.date_start, task.planned_date_start.date())
+        self.assertEqual(workload_user_1.date_end, task.planned_date_end.date())
+        self.assertEqual(workload_user_1.user_id, self.user_1)
+        self.assertFalse(workload_user_1.additional_workload_id)
+
+        self.assertEqual(workload_user_2.date_start, task.planned_date_start.date())
+        self.assertEqual(workload_user_2.date_end, task.planned_date_end.date())
+        self.assertEqual(workload_user_2.user_id, self.user_2)
+        self.assertFalse(workload_user_2.additional_workload_id)
+
+        self.assertEqual(
+            workload_management_user_1.date_start, task.planned_date_start.date()
+        )
+        self.assertEqual(
+            workload_management_user_1.date_end, task.planned_date_end.date()
+        )
+        self.assertEqual(workload_management_user_1.hours, 3.15)
+        self.assertEqual(workload_management_user_1.user_id, self.user_1)
+        self.assertEqual(
+            workload_management_user_1.additional_workload_id, self.add_work_management
+        )
+
+        self.assertEqual(
+            workload_review_user_2.date_start, task.planned_date_start.date()
+        )
+        self.assertEqual(workload_review_user_2.date_end, task.planned_date_end.date())
+        self.assertEqual(workload_review_user_2.hours, 4.2)
+        self.assertEqual(workload_review_user_2.user_id, self.user_2)
+        self.assertEqual(
+            workload_review_user_2.additional_workload_id, self.add_work_review
+        )
diff --git a/project_workload_additions/views/menu_view.xml b/project_workload_additions/views/menu_view.xml
new file mode 100644
index 00000000..7dd4bd7c
--- /dev/null
+++ b/project_workload_additions/views/menu_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+  <menuitem
+        id="project_workload_additions_menu"
+        name="Addition Types"
+        parent="project_workload.project_workload_menu"
+        sequence="10"
+        action="project_task_workload_addition_type_action"
+    />
+
+
+</odoo>
diff --git a/project_workload_additions/views/project_project_view.xml b/project_workload_additions/views/project_project_view.xml
new file mode 100644
index 00000000..b84080a2
--- /dev/null
+++ b/project_workload_additions/views/project_project_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="edit_project" model="ir.ui.view">
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project_workload.edit_project" />
+        <field name="arch" type="xml">
+            <group name="workload" position="attributes">
+                <attribute name="colspan">2</attribute>
+            </group>
+            <group name="workload" position="inside">
+                <field
+                    name="additional_workload_ids"
+                    groups="project_workload.group_project_workload"
+                    attrs="{'invisible': [('use_workload', '=', False)]}"
+                >
+                    <tree editable="bottom">
+                        <field name="type_id" />
+                        <field name="percentage" />
+                        <field name="user_id" />
+                        <field
+                            name="task_id"
+                            domain="[('project_id', '=', parent.id)]"
+                            context="{'default_project_id': parent.id}"
+                        />
+                    </tree>
+                </field>
+            </group>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload_additions/views/project_task_view.xml b/project_workload_additions/views/project_task_view.xml
new file mode 100644
index 00000000..611f11c7
--- /dev/null
+++ b/project_workload_additions/views/project_task_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="view_task_form2" model="ir.ui.view">
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project_workload.view_task_form2" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='workload_ids']/tree" position="inside">
+                <field name="additional_workload_id" />
+                <field name="additional_workload_task_id" optional="hide" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload_additions/views/project_task_workload_addition_type_views.xml b/project_workload_additions/views/project_task_workload_addition_type_views.xml
new file mode 100644
index 00000000..b98a464f
--- /dev/null
+++ b/project_workload_additions/views/project_task_workload_addition_type_views.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+  <record id="project_task_workload_addition_type_view_tree" model="ir.ui.view">
+    <field name="model">project.task.workload.addition.type</field>
+    <field name="arch" type="xml">
+      <tree>
+        <field name="name" />
+        <field name="description" />
+        <field name="default_percentage" optional="show" />
+      </tree>
+    </field>
+  </record>
+
+  <record id="project_task_workload_addition_type_view_form" model="ir.ui.view">
+    <field name="model">project.task.workload.addition.type</field>
+    <field name="arch" type="xml">
+      <form string="Type">
+        <sheet>
+          <div class="oe_title">
+            <h1>
+              <field name="name" placeholder="Type Name" />
+            </h1>
+          </div>
+          <group>
+            <group>
+              <field name="active" widget="boolean_toggle" />
+              <field name="description" />
+              <field name="default_percentage" />
+            </group>
+          </group>
+        </sheet>
+      </form>
+    </field>
+  </record>
+
+  <record id="project_task_workload_addition_type_view_search" model="ir.ui.view">
+    <field name="model">project.task.workload.addition.type</field>
+    <field name="arch" type="xml">
+      <search string="Workload Addition Types">
+        <field name="name" />
+        <field name="description" />
+      </search>
+    </field>
+  </record>
+
+  <record model="ir.actions.act_window" id="project_task_workload_addition_type_action">
+    <field name="name">Workload Addition Types</field>
+    <field name="type">ir.actions.act_window</field>
+    <field name="res_model">project.task.workload.addition.type</field>
+    <field name="view_mode">tree,form</field>
+    <field
+            name="search_view_id"
+            ref="project_task_workload_addition_type_view_search"
+        />
+    <field name="domain">[]</field>
+    <field name="context">{}</field>
+  </record>
+
+</odoo>
diff --git a/project_workload_additions/views/project_task_workload_view.xml b/project_workload_additions/views/project_task_workload_view.xml
new file mode 100644
index 00000000..d16b6899
--- /dev/null
+++ b/project_workload_additions/views/project_task_workload_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_task_workload_view_form" model="ir.ui.view">
+        <field name="model">project.task.workload</field>
+        <field
+            name="inherit_id"
+            ref="project_workload.project_task_workload_view_form"
+        />
+        <field name="arch" type="xml">
+            <field name="unit_ids" position="after">
+                <group>
+                    <field name="additional_workload_id" />
+                    <field name="additional_workload_task_id" />
+                </group>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload_capacity/__init__.py b/project_workload_capacity/__init__.py
new file mode 100644
index 00000000..55ec7fc9
--- /dev/null
+++ b/project_workload_capacity/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import reports
diff --git a/project_workload_capacity/__manifest__.py b/project_workload_capacity/__manifest__.py
new file mode 100644
index 00000000..1b3d1bf1
--- /dev/null
+++ b/project_workload_capacity/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload Capacity",
+    "summary": "Ressource Workload Capacity Management",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": [
+        "project_workload",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/project_capacity_unit_view.xml",
+        "views/project_user_capacity_view.xml",
+        "views/project_load_capacity_report_line_view.xml",
+        "views/project_load_capacity_report_view.xml",
+        "views/menu_view.xml",
+    ],
+    "installable": False,
+}
diff --git a/project_workload_capacity/models/__init__.py b/project_workload_capacity/models/__init__.py
new file mode 100644
index 00000000..a63b7b2c
--- /dev/null
+++ b/project_workload_capacity/models/__init__.py
@@ -0,0 +1,3 @@
+from . import project_capacity_unit
+from . import project_user_capacity
+from . import project_user_capacity_line
diff --git a/project_workload_capacity/models/project_capacity_unit.py b/project_workload_capacity/models/project_capacity_unit.py
new file mode 100644
index 00000000..7f7eddfd
--- /dev/null
+++ b/project_workload_capacity/models/project_capacity_unit.py
@@ -0,0 +1,66 @@
+# Copyright 2023 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from datetime import datetime
+
+from odoo import api, fields, models
+
+from odoo.addons.project_workload.models.project_task_workload import (
+    WEEK_FORMAT,
+    week_name,
+)
+
+
+class ProjectCapacityUnit(models.Model):
+    _name = "project.capacity.unit"
+    _description = "Project Capacity Unit"
+    _rec_name = "week"
+    _order = "week asc"
+
+    week = fields.Char()
+    capacity_id = fields.Many2one("project.user.capacity", "Capacity")
+    hours = fields.Float(compute="_compute_capacity", store=True)
+    user_id = fields.Many2one(
+        "res.users", "User", related="capacity_id.user_id", store=True
+    )
+    _sql_constraints = [
+        (
+            "week_capacity_uniq",
+            "unique(week, capacity_id)",
+            "The week must be uniq per capacity",
+        ),
+    ]
+
+    @api.depends(
+        "capacity_id.line_ids.hours",
+        "capacity_id.line_ids.date_start",
+        "capacity_id.line_ids.date_end",
+        "capacity_id.line_ids.modulo",
+    )
+    def _compute_capacity(self):
+        for record in self:
+            hours = 0
+            for line in record.capacity_id.line_ids:
+                start = week_name(line.date_start)
+                stop = week_name(line.date_end)
+                if record.week >= start and (not stop or record.week <= stop):
+                    if line.modulo > 1:
+                        nbr_week = round(
+                            (
+                                datetime.strptime(
+                                    record.week + "-1", WEEK_FORMAT + "-%w"
+                                ).date()
+                                - datetime.strptime(
+                                    start + "-1", WEEK_FORMAT + "-%w"
+                                ).date()
+                            ).days
+                            / 7
+                        )
+                        if nbr_week % line.modulo:
+                            # week is not a multi skip it
+                            continue
+                    hours = line.hours
+                    break
+            record.hours = hours
diff --git a/project_workload_capacity/models/project_user_capacity.py b/project_workload_capacity/models/project_user_capacity.py
new file mode 100644
index 00000000..594a8aa1
--- /dev/null
+++ b/project_workload_capacity/models/project_user_capacity.py
@@ -0,0 +1,51 @@
+# Copyright 2023 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from collections import defaultdict
+from datetime import datetime, timedelta
+
+from odoo import api, fields, models
+
+from odoo.addons.project_workload.models.project_task_workload import week_name
+
+
+class ProjectUserCapacity(models.Model):
+    _name = "project.user.capacity"
+    _description = "Project User Capacity"
+
+    name = fields.Char(required=True)
+    user_id = fields.Many2one("res.users", "User", required=True)
+    filter_id = fields.Many2one("ir.filters", "Domain")
+    line_ids = fields.One2many("project.user.capacity.line", "capacity_id", "Line")
+    unit_ids = fields.One2many("project.capacity.unit", "capacity_id", "Capacity Unit")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        records._generate_capacity_unit()
+        return records
+
+    def _cron_generate_week_report(self, nbr_week=52):
+        self.search([])._generate_capacity_unit(nbr_week=nbr_week)
+
+    def _generate_capacity_unit(self, nbr_week=52):
+        now = datetime.now()
+        items = self.env["project.capacity.unit"].search(
+            [("week", ">=", week_name(now))]
+        )
+        weeks_per_capacity = defaultdict(set)
+        for item in items:
+            weeks_per_capacity[item.capacity_id.id].add(item.week)
+        weeks = {week_name(now + timedelta(days=7 * x)) for x in range(nbr_week)}
+        vals_list = []
+        for capacity in self:
+            missing_weeks = weeks - weeks_per_capacity[capacity.id]
+            vals_list += [
+                {
+                    "week": week,
+                    "capacity_id": capacity.id,
+                }
+                for week in missing_weeks
+            ]
+        return self.env["project.capacity.unit"].create(vals_list)
diff --git a/project_workload_capacity/models/project_user_capacity_line.py b/project_workload_capacity/models/project_user_capacity_line.py
new file mode 100644
index 00000000..03a06bf3
--- /dev/null
+++ b/project_workload_capacity/models/project_user_capacity_line.py
@@ -0,0 +1,17 @@
+# Copyright 2023 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from odoo import fields, models
+
+
+class ProjectUserCapacityLine(models.Model):
+    _name = "project.user.capacity.line"
+    _description = "Project User Capacity Line"
+
+    capacity_id = fields.Many2one("project.user.capacity")
+    date_start = fields.Date(required=True, default=fields.Date.today())
+    date_end = fields.Date()
+    hours = fields.Float()
+    modulo = fields.Integer(default=1, string="Repeat", help="Repeat every X week")
diff --git a/project_workload_capacity/readme/CONTRIBUTORS.rst b/project_workload_capacity/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..bfd14efb
--- /dev/null
+++ b/project_workload_capacity/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* BEAU Sébastien <sebastien.beau@akretion.com>
diff --git a/project_workload_capacity/readme/DESCRIPTION.rst b/project_workload_capacity/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..ffb22876
--- /dev/null
+++ b/project_workload_capacity/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module allow to manage load and capacity by project and cross project
+Load is managed by week
diff --git a/project_workload_capacity/readme/ROADMAP.rst b/project_workload_capacity/readme/ROADMAP.rst
new file mode 100644
index 00000000..dd00217e
--- /dev/null
+++ b/project_workload_capacity/readme/ROADMAP.rst
@@ -0,0 +1,2 @@
+TODO
+- in case of manual workload assignation add a check on date
diff --git a/project_workload_capacity/reports/__init__.py b/project_workload_capacity/reports/__init__.py
new file mode 100644
index 00000000..0474dae2
--- /dev/null
+++ b/project_workload_capacity/reports/__init__.py
@@ -0,0 +1 @@
+from . import project_load_capacity_report
diff --git a/project_workload_capacity/reports/project_load_capacity_report.py b/project_workload_capacity/reports/project_load_capacity_report.py
new file mode 100644
index 00000000..45e79450
--- /dev/null
+++ b/project_workload_capacity/reports/project_load_capacity_report.py
@@ -0,0 +1,138 @@
+# Copyright 2023 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+import ast
+
+from odoo import fields, models
+from odoo.osv import expression
+
+
+class ProjectLoadCapacityReport(models.TransientModel):
+    _name = "project.load.capacity.report"
+    _description = "Project Load Capacity Report"
+
+    project_ids = fields.Many2many(comodel_name="project.project", string="Project")
+    line_ids = fields.One2many(
+        "project.load.capacity.report.line", "report_id", "Lines"
+    )
+
+    def _generate_lines(self):
+        capacities = self.env["project.user.capacity"].search([])
+        match_capacities = self.env["project.user.capacity"]
+        if self.project_ids:
+            projects = self.project_ids
+            for project in self.project_ids:
+                for capacity in capacities:
+                    if project.filtered_domain(capacity.filter_id.domain):
+                        match_capacities |= capacities
+        else:
+            match_capacities = capacities
+            projects = self.env["project.project"].search([])
+
+        # TODO fix domain (it's a string, it's expect a list)
+        domain = []
+        for capacity in match_capacities:
+            if capacity.filter_id.domain:
+                capacity_domain = ast.literal_eval(capacity.filter_id.domain)
+            else:
+                capacity_domain = []
+            domain = expression.OR([domain, capacity_domain])
+        match_projects = self.env["project.project"].search(domain)
+
+        # TODO add timesheet to know what have been done this week
+        self.env.cr.execute(
+            """
+            INSERT INTO project_load_capacity_report_line (
+                report_id,
+                total_capacity_hours,
+                total_planned_hours,
+                project_capacity_hours,
+                project_planned_hours,
+                project_available_hours,
+                week,
+                user_id
+                )
+                SELECT
+                    %s AS report_id,
+                    total_capacity.hours as total_capacity_hours,
+                    total_planned.hours as total_planned_hours,
+                    project_capacity.hours as project_capacity_hours,
+                    project_planned.hours as project_planned_hours,
+                    project_capacity_hours -
+                    match_project_planned_hours as project_available_hours,
+                    total_capacity.week as week,
+                    total_capacity.user_id
+                FROM (
+                    SELECT week, user_id, sum(hours) as hours
+                        FROM project_capacity_unit
+                        GROUP BY week, user_id
+                    ) AS total_capacity
+                FULL JOIN (
+                    SELECT week, user_id, sum(hours) as hours
+                        FROM project_workload_unit
+                        GROUP BY week, user_id
+                    ) AS total_planned
+                    ON total_capacity.week = total_planned.week
+                    AND total_capacity.user_id = total_planned.user_id
+                FULL JOIN (
+                    SELECT week, user_id, sum(hours) as hours
+                        FROM project_capacity_unit
+                        WHERE capacity_id in %s
+                        GROUP BY week, user_id
+                    ) AS project_capacity
+                    ON total_capacity.week = project_capacity.week
+                    AND total_capacity.user_id = project_capacity.user_id
+                FULL JOIN (
+                    SELECT week, user_id, sum(hours) as hours
+                        FROM project_workload_unit
+                        WHERE project_id in %s
+                        GROUP BY week, user_id
+                    ) AS match_project_planned
+                    ON total_capacity.week = match_project_planned.week
+                    AND total_capacity.user_id = match_project_planned.user_id
+                FULL JOIN (
+                    SELECT week, user_id, sum(hours) as hours
+                        FROM project_workload_unit
+                        WHERE project_id in %s
+                        GROUP BY week, user_id
+                    ) AS project_planned
+                    ON total_capacity.week = project_planned.week
+                    AND total_capacity.user_id = project_planned.user_id
+        """,
+            (
+                self.id,
+                tuple(match_capacities.ids),
+                tuple(match_projects.ids),
+                tuple(projects.ids),
+            ),
+        )
+        self.env.clear()
+
+    def refresh_lines(self):
+        self.line_ids.unlink()
+        # self._generate_lines()
+        return True
+
+    def open_report(self):
+        self.refresh_lines()
+        action = (
+            self.env.ref("project_workload.project_load_capacity_report_line_action")
+            .sudo()
+            .read()[0]
+        )
+        action["domain"] = [("report_id", "=", self.id)]
+        return action
+
+
+class ProjectLoadReportLine(models.TransientModel):
+    _name = "project.load.capacity.report.line"
+    _description = "Project Load Report Line"
+
+    week = fields.Char()
+    user_id = fields.Many2one("res.users", "User")
+    total_planned_hours = fields.Float()
+    total_capacity_hours = fields.Float()
+    project_planned_hours = fields.Float()
+    project_capacity_hours = fields.Float()
+    project_available_hours = fields.Float()
+    report_id = fields.Many2one("project.load.capacity.report", "Report")
diff --git a/project_workload_capacity/security/ir.model.access.csv b/project_workload_capacity/security/ir.model.access.csv
new file mode 100644
index 00000000..6d5590bb
--- /dev/null
+++ b/project_workload_capacity/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_edit_project_user_capacity,edit project user capacity,model_project_user_capacity,project.group_project_user,1,1,1,1
+access_edit_project_user_capacity_line,edit project user capacity line,model_project_user_capacity_line,project.group_project_user,1,1,1,1
+access_edit_project_capacity_unit,edit project capacity unit,model_project_capacity_unit,project.group_project_user,1,1,1,1
+access_edit_project_load_capacity_report,edit project load report,model_project_load_capacity_report,project.group_project_user,1,1,1,1
+access_edit_project_load_capacity_report_line,edit project load report line,model_project_load_capacity_report_line,project.group_project_user,1,1,1,1
diff --git a/project_workload_capacity/tests/__init__.py b/project_workload_capacity/tests/__init__.py
new file mode 100644
index 00000000..5c9b38db
--- /dev/null
+++ b/project_workload_capacity/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_workload
diff --git a/project_workload_capacity/tests/test_workload.py b/project_workload_capacity/tests/test_workload.py
new file mode 100644
index 00000000..e6dadfc6
--- /dev/null
+++ b/project_workload_capacity/tests/test_workload.py
@@ -0,0 +1,66 @@
+# Copyright 2023 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo.addons.project_workload.tests.common import TestWorkloadCommon
+
+
+class TestWorkloadCapacity(TestWorkloadCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.capacity = cls.env["project.user.capacity"].create(
+            {
+                "name": "My Capacity for project 1",
+                "user_id": cls.user_1.id,
+                "filter_id": cls.project_filter.id,
+                "line_ids": [
+                    (0, 0, {"hours": 21}),
+                ],
+            }
+        )
+
+    def test_create_capacity(self):
+        self.assertEqual(len(self.capacity.unit_ids), 52)
+        self.assertEqual(set(self.capacity.unit_ids.mapped("hours")), {21})
+
+    def test_cron_create_capacity(self):
+        self.env["project.user.capacity"]._cron_generate_week_report(60)
+        self.assertEqual(len(self.capacity.unit_ids), 60)
+        self.assertEqual(set(self.capacity.unit_ids.mapped("hours")), {21})
+
+    def test_change_capacity_hours(self):
+        self.capacity.line_ids.hours = 28
+        self.assertEqual(set(self.capacity.unit_ids.mapped("hours")), {28})
+
+    def test_capacity_modulo(self):
+        self.capacity.line_ids.modulo = 3
+        for idx, unit in enumerate(self.capacity.unit_ids.sorted()):
+            if idx % 3:
+                self.assertEqual(unit.hours, 0)
+            else:
+                self.assertEqual(unit.hours, 21)
+
+    def test_capacity_date_start_end(self):
+        self.capacity.line_ids.date_end = datetime.now() + timedelta(days=70)
+        for idx, unit in enumerate(self.capacity.unit_ids.sorted()):
+            if idx <= 10:
+                self.assertEqual(unit.hours, 21)
+            else:
+                self.assertEqual(unit.hours, 0)
+
+    def test_generate_report(self):
+        report = self.env["project.load.capacity.report"].create({})
+        report._generate_lines()
+        for line in report.line_ids:
+            self.assertEqual(line.user_id, self.user_1)
+            if line.week in ["2023-30", "2023-31", "2023-32"]:
+                self.assertEqual(line.total_planned_hours, 7)
+                self.assertEqual(line.project_planned_hours, 7)
+            else:
+                self.assertEqual(line.total_planned_hours, 0)
+                self.assertEqual(line.project_planned_hours, 0)
+            self.assertEqual(line.total_capacity_hours, 21)
+            self.assertEqual(line.project_capacity_hours, 21)
diff --git a/project_workload_capacity/views/menu_view.xml b/project_workload_capacity/views/menu_view.xml
new file mode 100644
index 00000000..5c64e658
--- /dev/null
+++ b/project_workload_capacity/views/menu_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <menuitem
+        id="project_user_capacity_menu"
+        parent="project_workload.project_workload_menu"
+        sequence="20"
+        action="project_user_capacity_action"
+    />
+
+    <menuitem
+        id="project_load_capacity_report_menu"
+        parent="project_workload.project_workload_menu"
+        sequence="40"
+        action="project_load_capacity_report_action"
+    />
+
+</odoo>
diff --git a/project_workload_capacity/views/project_capacity_unit_view.xml b/project_workload_capacity/views/project_capacity_unit_view.xml
new file mode 100644
index 00000000..96566466
--- /dev/null
+++ b/project_workload_capacity/views/project_capacity_unit_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_capacity_unit_view_tree" model="ir.ui.view">
+        <field name="model">project.capacity.unit</field>
+        <field name="arch" type="xml">
+            <tree string="Capacity Unit">
+                <field name="capacity_id" />
+                <field name="week" />
+                <field name="hours" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_capacity_unit_view_search" model="ir.ui.view">
+        <field name="model">project.capacity.unit</field>
+        <field name="arch" type="xml">
+            <search string="Capacity Unit">
+                <field name="capacity_id" />
+                <field name="week" />
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="project_capacity_unit_action">
+        <field name="name">Capacity Unit</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.capacity.unit</field>
+        <field name="view_mode">tree</field>
+        <field name="search_view_id" ref="project_capacity_unit_view_search" />
+        <field name="domain">[]</field>
+        <field name="context">{}</field>
+    </record>
+
+</odoo>
diff --git a/project_workload_capacity/views/project_load_capacity_report_line_view.xml b/project_workload_capacity/views/project_load_capacity_report_line_view.xml
new file mode 100644
index 00000000..3c4f2970
--- /dev/null
+++ b/project_workload_capacity/views/project_load_capacity_report_line_view.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_load_capacity_report_line_view_tree" model="ir.ui.view">
+        <field name="model">project.load.capacity.report.line</field>
+        <field name="arch" type="xml">
+            <tree string="Load Report Line">
+                <field name="week" />
+                <field name="user_id" />
+                <field name="total_planned_hours" />
+                <field name="total_capacity_hours" />
+                <field name="project_planned_hours" />
+                <field name="project_capacity_hours" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_load_capacity_report_line_view_search" model="ir.ui.view">
+        <field name="model">project.load.capacity.report.line</field>
+        <field name="arch" type="xml">
+            <search string="Load Report Line">
+                <field name="week" />
+                <field name="user_id" />
+                <group expand="0" string="Group By">
+                    <filter
+                        string="Week"
+                        name="groupby_week"
+                        domain="[]"
+                        context="{'group_by': 'week'}"
+                    />
+                    <filter
+                        string="User"
+                        name="groupby_user"
+                        domain="[]"
+                        context="{'group_by': 'user_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="project_load_capacity_report_line_view_pivot" model="ir.ui.view">
+        <field name="model">project.load.capacity.report.line</field>
+        <field name="arch" type="xml">
+            <pivot string="Load Analysis" disable_linking="True" sample="1">
+                <field name="user_id" type="col" />
+                <field name="week" type="row" />
+                <field name="total_planned_hours" type="measure" />
+                <field name="total_capacity_hours" type="measure" />
+                <field name="project_planned_hours" type="measure" />
+                <field name="project_capacity_hours" type="measure" />
+            </pivot>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="project_load_capacity_report_line_action">
+        <field name="name">Load Report Line</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.load.capacity.report.line</field>
+        <field name="view_mode">tree,form,pivot</field>
+        <field
+            name="search_view_id"
+            ref="project_load_capacity_report_line_view_search"
+        />
+        <field name="domain">[]</field>
+        <field name="context">{}</field>
+    </record>
+
+</odoo>
diff --git a/project_workload_capacity/views/project_load_capacity_report_view.xml b/project_workload_capacity/views/project_load_capacity_report_view.xml
new file mode 100644
index 00000000..3104187b
--- /dev/null
+++ b/project_workload_capacity/views/project_load_capacity_report_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_load_capacity_report_view_form" model="ir.ui.view">
+        <field name="model">project.load.capacity.report</field>
+        <field name="arch" type="xml">
+            <form string="Load Report">
+            Filter the project to analyse (if empty all project will be used)
+                <field name="project_ids" widget="many2many_tags" />
+                <footer>
+                    <button
+                        string="Confirm"
+                        name="open_report"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                    <button string="Cancel" class="btn btn-default" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="project_load_capacity_report_action">
+        <field name="name">Load Report</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.load.capacity.report</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="domain">[]</field>
+        <field name="context">{}</field>
+    </record>
+
+</odoo>
diff --git a/project_workload_capacity/views/project_user_capacity_view.xml b/project_workload_capacity/views/project_user_capacity_view.xml
new file mode 100644
index 00000000..87a79af7
--- /dev/null
+++ b/project_workload_capacity/views/project_user_capacity_view.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+    <record id="project_user_capacity_view_tree" model="ir.ui.view">
+        <field name="model">project.user.capacity</field>
+        <field name="arch" type="xml">
+            <tree string="Capacity">
+                <field name="name" />
+                <field name="user_id" />
+                <field name="filter_id" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_user_capacity_view_form" model="ir.ui.view">
+        <field name="model">project.user.capacity</field>
+        <field name="arch" type="xml">
+            <form string="Capacity">
+                <div class="oe_button_box" name="button_box">
+                    <button
+                        class="oe_stat_button"
+                        type="action"
+                        name="%(project_capacity_unit_action)d"
+                        icon="fa-book"
+                    >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_text">Capacity Unit</span>
+                        </div>
+                    </button>
+                </div>
+                <div class="oe_title">
+                    <h1>
+                        <field name="name" placeholder="name" />
+                    </h1>
+                </div>
+                <group>
+                    <group>
+                        <field name="user_id" />
+                        <field
+                            name="filter_id"
+                            context="{'default_model_id': 'project.project'}"
+                        />
+                    </group>
+                </group>
+                <field name="line_ids">
+                    <tree editable="bottom">
+                        <field name="date_start" />
+                        <field name="date_end" />
+                        <field name="hours" />
+                        <field name="modulo" />
+                    </tree>
+                </field>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_user_capacity_view_search" model="ir.ui.view">
+        <field name="model">project.user.capacity</field>
+        <field name="arch" type="xml">
+            <search string="Capacity">
+                <field name="name" />
+                <field name="user_id" />
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="project_user_capacity_action">
+        <field name="name">Capacity</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.user.capacity</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="project_user_capacity_view_search" />
+        <field name="domain">[]</field>
+        <field name="context">{}</field>
+    </record>
+
+</odoo>
diff --git a/project_workload_milestone/README.rst b/project_workload_milestone/README.rst
new file mode 100644
index 00000000..15968256
--- /dev/null
+++ b/project_workload_milestone/README.rst
@@ -0,0 +1,67 @@
+==========================
+Project Workload Milestone
+==========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:963931779fa5135c8ec9245b45c21251fe06d687dc681bec0bea93a13ff80f36
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_milestone
+    :alt: akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+This module makes tasks inherit milestones start and end dates.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_milestone%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `akretion/ak-odoo-incubator <https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_milestone>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/project_workload_milestone/__init__.py b/project_workload_milestone/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_workload_milestone/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_workload_milestone/__manifest__.py b/project_workload_milestone/__manifest__.py
new file mode 100644
index 00000000..e037be2a
--- /dev/null
+++ b/project_workload_milestone/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload Milestone",
+    "summary": "Add Milestone Support to Project Workload",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": [
+        "project_workload",
+    ],
+    "data": [
+        "views/project_milestone.xml",
+    ],
+    "auto_install": True,
+}
diff --git a/project_workload_milestone/models/__init__.py b/project_workload_milestone/models/__init__.py
new file mode 100644
index 00000000..fed98971
--- /dev/null
+++ b/project_workload_milestone/models/__init__.py
@@ -0,0 +1,2 @@
+from . import project_milestone
+from . import project_task
diff --git a/project_workload_milestone/models/project_milestone.py b/project_workload_milestone/models/project_milestone.py
new file mode 100644
index 00000000..2013baf8
--- /dev/null
+++ b/project_workload_milestone/models/project_milestone.py
@@ -0,0 +1,53 @@
+# Copyright 2024 Akretion (http://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from datetime import timedelta
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ProjectMilestone(models.Model):
+    _inherit = "project.milestone"
+
+    start_date = fields.Date(
+        help="The date when the Milestone should start.",
+        compute="_compute_milestone_start_date",
+        store=True,
+        readonly=False,
+    )
+
+    @api.constrains("start_date", "deadline")
+    def _check_start_date(self):
+        for milestone in self:
+            if (
+                milestone.deadline
+                and milestone.start_date
+                and milestone.deadline < milestone.start_date
+            ):
+                raise ValidationError(
+                    _("The end date cannot be earlier than the start date.")
+                )
+
+    @api.depends("deadline", "project_id")
+    def _compute_milestone_start_date(self):
+        for record in self:
+            if record.start_date:
+                continue
+            if not record.deadline:
+                record.start_date = False
+                continue
+
+            # Use a simple algorithm to find the start date
+            # Find previous milestone
+            previous_milestones = self.search(
+                [
+                    ("project_id", "=", record.project_id.id),
+                    ("deadline", "<", record.deadline),
+                ],
+                order="deadline desc",
+                limit=1,
+            )
+            # The start date will be the end date of the previous milestone
+            if previous_milestones.deadline:
+                record.start_date = previous_milestones.deadline + timedelta(days=1)
diff --git a/project_workload_milestone/models/project_task.py b/project_workload_milestone/models/project_task.py
new file mode 100644
index 00000000..4d09d0fb
--- /dev/null
+++ b/project_workload_milestone/models/project_task.py
@@ -0,0 +1,26 @@
+# Copyright 2024 Akretion (http://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    planned_date_start = fields.Datetime(
+        compute="_compute_planned_date_start_end",
+        store=True,
+        readonly=False,
+    )
+    planned_date_end = fields.Datetime(
+        compute="_compute_planned_date_start_end",
+        store=True,
+        readonly=False,
+    )
+
+    @api.depends("milestone_id.start_date", "milestone_id.deadline")
+    def _compute_planned_date_start_end(self):
+        for record in self:
+            record.planned_date_end = record.milestone_id.deadline
+            record.planned_date_start = record.milestone_id.start_date
diff --git a/project_workload_milestone/readme/CONTRIBUTORS.rst b/project_workload_milestone/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..292f457e
--- /dev/null
+++ b/project_workload_milestone/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
diff --git a/project_workload_milestone/readme/DESCRIPTION.rst b/project_workload_milestone/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..9aaf0290
--- /dev/null
+++ b/project_workload_milestone/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module makes tasks inherit milestones start and end dates.
diff --git a/project_workload_milestone/static/description/index.html b/project_workload_milestone/static/description/index.html
new file mode 100644
index 00000000..8ab79a4b
--- /dev/null
+++ b/project_workload_milestone/static/description/index.html
@@ -0,0 +1,424 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Project Workload Milestone</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="project-workload-milestone">
+<h1 class="title">Project Workload Milestone</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:963931779fa5135c8ec9245b45c21251fe06d687dc681bec0bea93a13ff80f36
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_milestone"><img alt="akretion/ak-odoo-incubator" src="https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github" /></a></p>
+<p>This module makes tasks inherit milestones start and end dates.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_milestone%0Aversion:%2016.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">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:
+* BEAU Sébastien &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;
+* Florian Mounier &lt;<a class="reference external" href="mailto:florian.mounier&#64;akretion.com">florian.mounier&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_milestone">akretion/ak-odoo-incubator</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/project_workload_milestone/views/project_milestone.xml b/project_workload_milestone/views/project_milestone.xml
new file mode 100644
index 00000000..b159bfc3
--- /dev/null
+++ b/project_workload_milestone/views/project_milestone.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 Akretion (http://www.akretion.com).
+ @author Florian Mounier <florian.mounier@akretion.com>
+ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="project_milestone_view_form" model="ir.ui.view">
+        <field name="model">project.milestone</field>
+        <field name="inherit_id" ref="project.project_milestone_view_form" />
+        <field name="priority" eval="100" />
+        <field name="arch" type="xml">
+            <field name="deadline" position="before">
+                <field name="start_date" />
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/project_workload_timesheet/README.rst b/project_workload_timesheet/README.rst
new file mode 100644
index 00000000..34c36503
--- /dev/null
+++ b/project_workload_timesheet/README.rst
@@ -0,0 +1,67 @@
+==========================
+Project Workload Timesheet
+==========================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:b5ef5651db27343b28f51a36a2f4861a7bb7140f293ac5b3700c16853bf1354a
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet
+    :alt: akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+This module adds workloads directly in timesheets.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_timesheet%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `akretion/ak-odoo-incubator <https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/project_workload_timesheet/__init__.py b/project_workload_timesheet/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_workload_timesheet/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_workload_timesheet/__manifest__.py b/project_workload_timesheet/__manifest__.py
new file mode 100644
index 00000000..4aabe81b
--- /dev/null
+++ b/project_workload_timesheet/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <sebastien.beau@akretion.com>
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload Timesheet",
+    "summary": "Add Workload To Timesheets",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": [
+        "project_workload",
+        "hr_timesheet_sheet",
+    ],
+    "data": [
+        "views/hr_timesheet_sheet_views.xml",
+    ],
+}
diff --git a/project_workload_timesheet/models/__init__.py b/project_workload_timesheet/models/__init__.py
new file mode 100644
index 00000000..bd28cf78
--- /dev/null
+++ b/project_workload_timesheet/models/__init__.py
@@ -0,0 +1,3 @@
+from . import account_analytic_line
+from . import hr_timesheet_sheet
+from . import project_workload_unit
diff --git a/project_workload_timesheet/models/account_analytic_line.py b/project_workload_timesheet/models/account_analytic_line.py
new file mode 100644
index 00000000..9fe1cc63
--- /dev/null
+++ b/project_workload_timesheet/models/account_analytic_line.py
@@ -0,0 +1,62 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+from odoo.addons.project_workload.models.project_task_workload import week_name
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = "account.analytic.line"
+
+    workload_unit_id = fields.Many2one(
+        comodel_name="project.workload.unit",
+        string="Workload Unit",
+        readonly=False,
+        compute="_compute_workload_unit_id",
+        store=True,
+        domain="["
+        "('week', '=', week), "
+        "('user_id', '=', user_id), "
+        "('project_id', '=', project_id), "
+        "('task_id', '=', task_id)"
+        "]",
+    )
+
+    week = fields.Char(
+        compute="_compute_week",
+        help="Week number of the year",
+    )
+
+    @api.depends("date")
+    def _compute_week(self):
+        for record in self:
+            record.week = week_name(record.date)
+
+    @api.depends("task_id", "date", "user_id")
+    def _compute_workload_unit_id(self):
+        for record in self:
+            if not record.project_id or not record.task_id:
+                record.workload_unit_id = False
+                continue
+            available_workload_units = self.env["project.workload.unit"].search(
+                record._get_available_workload_units_domain()
+            )
+            if (
+                not record.workload_unit_id
+                or record.workload_unit_id not in available_workload_units
+            ):
+                record.workload_unit_id = (
+                    available_workload_units[0]
+                    if len(available_workload_units) > 0
+                    else False
+                )
+
+    def _get_available_workload_units_domain(self):
+        return [
+            ("project_id", "=", self.project_id.id),
+            ("task_id", "=", self.task_id.id),
+            ("week", "=", self.week),
+            ("user_id", "=", self.user_id.id),
+        ]
diff --git a/project_workload_timesheet/models/hr_timesheet_sheet.py b/project_workload_timesheet/models/hr_timesheet_sheet.py
new file mode 100644
index 00000000..cc812ef5
--- /dev/null
+++ b/project_workload_timesheet/models/hr_timesheet_sheet.py
@@ -0,0 +1,192 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import timedelta
+
+from odoo import api, fields, models
+
+from odoo.addons.project_workload.models.project_task_workload import week_name
+
+
+class Sheet(models.Model):
+    _inherit = "hr_timesheet.sheet"
+
+    workload_unit_ids = fields.One2many(
+        "project.workload.unit",
+        string="Workload Units",
+        compute="_compute_workload_unit_ids",
+        readonly=False,
+    )
+
+    next_week_load = fields.Float(
+        compute="_compute_next_week_load",
+        help="The workload of the next week",
+    )
+    next_week_units_count = fields.Integer(
+        compute="_compute_next_week_load",
+        help="The number of workload units of the next week",
+    )
+
+    current = fields.Boolean(
+        compute="_compute_current",
+        help="Is this the current timesheet",
+    )
+
+    @api.depends("date_start", "date_end", "user_id")
+    def _compute_workload_unit_ids(self):
+        for record in self:
+            week = week_name(self.date_start)  # Use only start date for now
+            record.workload_unit_ids = (
+                self.env["project.workload.unit"]
+                .search(
+                    [
+                        ("week", "=", week),
+                        ("user_id", "=", record.user_id.id),
+                    ],
+                )
+                .sorted(
+                    lambda p: (
+                        p.done,  # Put done tasks at the end
+                        -int(p.priority or 0),  # Sort by priority
+                        p.remaining_hours,  # Sort by remaining hours
+                        -p.id,  # Stabilize sort
+                    )
+                )
+            )
+
+    @api.depends("date_start", "date_end", "user_id")
+    def _compute_next_week_load(self):
+        for record in self:
+            next_week = week_name(self.date_start + timedelta(days=7))
+            next_week_units = self.env["project.workload.unit"].search(
+                [
+                    ("week", "=", next_week),
+                    ("user_id", "=", record.user_id.id),
+                ],
+            )
+            record.next_week_units_count = len(next_week_units)
+            record.next_week_load = sum(next_week_units.mapped("hours"))
+
+    @api.depends("date_start", "date_end")
+    def _compute_current(self):
+        for record in self:
+            record.current = record.date_start <= fields.Date.today() <= record.date_end
+
+    def button_open_next_week(self):
+        self.ensure_one()
+        next_week = self.date_start + timedelta(days=7)
+        date_start = self._get_period_start(self.env.user.company_id, next_week)
+        date_end = self._get_period_end(self.env.user.company_id, next_week)
+        next_week_sheet = self.env["hr_timesheet.sheet"].search(
+            [
+                ("date_start", "=", date_start),
+                ("date_end", "=", date_end),
+                ("user_id", "=", self.user_id.id),
+            ],
+            limit=1,
+        )
+        view = {
+            "name": "Next Week",
+            "type": "ir.actions.act_window",
+            "res_model": "hr_timesheet.sheet",
+            "view_id": self.env.ref(
+                "project_workload_timesheet.hr_timesheet_sheet_form_my"
+            ).id,
+            "view_mode": "form",
+            "context": {
+                "default_date_start": date_start,
+                "default_date_end": date_end,
+                "default_user_id": self.user_id.id,
+            },
+            "target": "current",
+        }
+        if next_week_sheet:
+            view["res_id"] = next_week_sheet.id
+
+        return view
+
+    def _add_line_from_unit(self, unit):
+        if self.state not in ["new", "draft"]:
+            return
+        values = self._prepare_empty_analytic_line()
+        new_line_unique_id = self._get_new_line_unique_id()
+        existing_unique_ids = list(
+            {frozenset(line.get_unique_id().items()) for line in self.line_ids}
+        )
+        if existing_unique_ids:
+            self.delete_empty_lines(False)
+        if frozenset(new_line_unique_id.items()) not in existing_unique_ids:
+            task = unit._get_timesheeting_task()
+            if self.current:
+                values["date"] = fields.Date.today()
+
+            values["unit_amount"] = 0
+            values["project_id"] = task.project_id.id
+            values["task_id"] = task.id
+            values["workload_unit_id"] = unit.id
+            return self.env["account.analytic.line"]._sheet_create(values)
+
+    @api.model
+    def _prepare_new_line(self, line):
+        # We need to check if the new line is similar to a workload unit
+        # If it is, we need to link it to the workload unit
+        vals = super()._prepare_new_line(line)
+        # Yeah, using the same function for 2 different things leads to this :/
+        if line._name != "hr_timesheet.sheet.new.analytic.line":
+            return vals
+        timesheets = line.sheet_id.timesheet_ids
+        similar_timesheets = timesheets.filtered(
+            lambda t: t.project_id == line.project_id and t.task_id == line.task_id
+        )
+        if not similar_timesheets:
+            return vals
+
+        similar_workload_units = similar_timesheets.mapped("workload_unit_id")
+        vals["workload_unit_id"] = (
+            similar_workload_units.ids[0] if similar_workload_units else False
+        )
+        return vals
+
+    def action_timesheet_done(self):
+        self.ensure_one()
+        rv = super().action_timesheet_done()
+
+        next_week = week_name(self.date_start + timedelta(days=7))
+        next_week_units = self.env["project.workload.unit"].search(
+            [
+                ("week", "=", next_week),
+                ("user_id", "=", self.user_id.id),
+            ],
+        )
+
+        unfinished_units = self.workload_unit_ids.filtered(lambda u: not u.done)
+        for unit in unfinished_units:
+            next_week_unit = next_week_units.filtered(
+                lambda u: u.project_id == unit.project_id
+                and u.task_id == unit.task_id
+                and u.workload_id == unit.workload_id
+            )
+
+            # But we report the remaining hours to the next week
+            # We also report if the remaining hours are negative
+            # It will decrease the next week workload
+            # But we don't create a unit in this case
+            if not next_week_unit and unit.remaining_hours > 0:
+                # And we create a new unit if it does not exist
+                # Even if the unit could be after end_date for now
+                next_week_unit = self.env["project.workload.unit"].create(
+                    {
+                        "task_id": unit.task_id.id,
+                        "workload_id": unit.workload_id.id,
+                        "week": next_week,
+                        "hours": unit.remaining_hours,
+                    }
+                )
+            else:
+                next_week_unit.hours += unit.remaining_hours
+
+            # The unit are now done so the unit hours are the timesheeted hours
+            unit.hours = unit.timesheeted_hours
+
+        return rv
diff --git a/project_workload_timesheet/models/project_workload_unit.py b/project_workload_timesheet/models/project_workload_unit.py
new file mode 100644
index 00000000..8fd603c9
--- /dev/null
+++ b/project_workload_timesheet/models/project_workload_unit.py
@@ -0,0 +1,96 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProjectWorkloadUnit(models.Model):
+    _inherit = "project.workload.unit"
+
+    timesheet_ids = fields.One2many(
+        "account.analytic.line",
+        "workload_unit_id",
+        "Timesheets",
+        help="The timesheets (normally one) in which the workload is timesheeted",
+    )
+    priority = fields.Selection(related="task_id.priority")
+
+    timesheeted_hours = fields.Float(
+        compute="_compute_timesheeted_hours",
+        help="The hours timesheeted on this workload",
+    )
+    remaining_hours = fields.Float(
+        compute="_compute_remaining_hours",
+        help="The remaining hours to timesheet on this workload (can be negative)",
+    )
+    progress = fields.Float(
+        compute="_compute_progress",
+        help="The progress of the task",
+    )
+    force_done = fields.Boolean()
+    task_stage_id = fields.Many2one(
+        related="task_id.stage_id", string="Task Stage", readonly=False
+    )
+
+    @api.depends("force_done")
+    def _compute_done(self):
+        return super()._compute_done()
+
+    def is_done(self):
+        return super().is_done() or self.force_done
+
+    @api.depends("timesheet_ids.unit_amount")
+    def _compute_timesheeted_hours(self):
+        for record in self:
+            record.timesheeted_hours = sum(record.timesheet_ids.mapped("unit_amount"))
+
+    @api.depends("hours", "timesheeted_hours")
+    def _compute_progress(self):
+        for record in self:
+            if record.hours:
+                record.progress = 100 * record.timesheeted_hours / record.hours
+            else:
+                record.progress = 0
+
+    @api.depends("hours", "timesheeted_hours", "done")
+    def _compute_remaining_hours(self):
+        for record in self:
+            if record.done:
+                record.remaining_hours = 0
+            else:
+                record.remaining_hours = record.hours - record.timesheeted_hours
+
+    def action_add_to_timesheet(self):
+        sheet_id = self.env.context.get("current_sheet_id")
+        if not sheet_id:
+            return
+        sheet = self.env["hr_timesheet.sheet"].browse(sheet_id)
+        return sheet._add_line_from_unit(self)
+
+    def action_timesheet_time(self):
+        sheet_id = self.env.context.get("current_sheet_id")
+        if not sheet_id:
+            return
+        sheet = self.env["hr_timesheet.sheet"].browse(sheet_id)
+        if not sheet or not sheet.current:
+            return
+        time = self.env.context.get("time", 0) / 60
+
+        # Add only on lines without names
+        timesheet = self.timesheet_ids.filtered(
+            lambda t: t.date == fields.Date.today() and t.name == "/"
+        )
+        if len(timesheet) > 1:
+            timesheet = timesheet[0]
+        if not timesheet:
+            timesheet = sheet._add_line_from_unit(self)
+        timesheet.unit_amount += time
+        return True
+
+    def action_timesheet_done(self):
+        self.force_done = True
+
+    def _get_timesheeting_task(self):
+        # For overrides
+        return self.task_id
diff --git a/project_workload_timesheet/readme/CONTRIBUTORS.rst b/project_workload_timesheet/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..292f457e
--- /dev/null
+++ b/project_workload_timesheet/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
diff --git a/project_workload_timesheet/readme/DESCRIPTION.rst b/project_workload_timesheet/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..6245425c
--- /dev/null
+++ b/project_workload_timesheet/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module adds workloads directly in timesheets.
diff --git a/project_workload_timesheet/static/description/index.html b/project_workload_timesheet/static/description/index.html
new file mode 100644
index 00000000..8d017e2c
--- /dev/null
+++ b/project_workload_timesheet/static/description/index.html
@@ -0,0 +1,424 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Project Workload Timesheet</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="project-workload-timesheet">
+<h1 class="title">Project Workload Timesheet</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:b5ef5651db27343b28f51a36a2f4861a7bb7140f293ac5b3700c16853bf1354a
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet"><img alt="akretion/ak-odoo-incubator" src="https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github" /></a></p>
+<p>This module adds workloads directly in timesheets.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_timesheet%0Aversion:%2016.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">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:
+* BEAU Sébastien &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;
+* Florian Mounier &lt;<a class="reference external" href="mailto:florian.mounier&#64;akretion.com">florian.mounier&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet">akretion/ak-odoo-incubator</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/project_workload_timesheet/views/hr_timesheet_sheet_views.xml b/project_workload_timesheet/views/hr_timesheet_sheet_views.xml
new file mode 100644
index 00000000..5a95f632
--- /dev/null
+++ b/project_workload_timesheet/views/hr_timesheet_sheet_views.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="hr_timesheet_sheet_form_my" model="ir.ui.view">
+        <field name="model">hr_timesheet.sheet</field>
+        <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form_my" />
+        <field name="arch" type="xml">
+            <div class="oe_title" position="before">
+                <div
+                    class="oe_button_box"
+                    name="button_box"
+                    groups="project_workload.group_project_workload"
+                >
+                    <button
+                        name="button_open_next_week"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-tasks"
+                        attrs="{'invisible': [('next_week_units_count','=', 0)]}"
+                    >
+                        <field name="next_week_units_count" invisible="1" />
+                        <span>Next:
+                            <field
+                                class="font-weight-bold"
+                                style="font-size: 1.25em"
+                                name="next_week_load"
+                                widget="integer"
+                                decoration-success="next_week_load &lt; 10"
+                                decoration-info="next_week_load &gt;= 10 and next_week_load &lt; 30"
+                                decoration-warning="next_week_load &gt;= 30 and next_week_load &lt; 40"
+                                decoration-danger="next_week_load &gt;= 40"
+                            />
+                        </span>
+                    </button>
+                </div>
+            </div>
+
+            <xpath
+                expr="//field[@name='timesheet_ids']/tree/field[@name='task_id']"
+                position="after"
+            >
+                <field name="week" invisible="1" />
+                <field name="workload_unit_id" optional="show" />
+            </xpath>
+
+            <sheet position="inside">
+                <field name="current" invisible="1" />
+                <div groups="project_workload.group_project_workload">
+                    <h2 class="mb-4">Todo</h2>
+                    <field name="workload_unit_ids">
+                        <tree
+                            editable="bottom"
+                            create="false"
+                            decoration-success="done"
+                            decoration-warning="not done and parent.state == 'done'"
+                            decoration-danger="remaining_hours &lt;= 0 and not done and parent.state != 'done'"
+                        >
+                            <field name="done" invisible="1" />
+                            <field name="timesheet_ids" invisible="1" />
+                            <button
+                                name="action_add_to_timesheet"
+                                class="btn btn-secondary text-primary"
+                                icon="fa-angle-double-up"
+                                title="Add to timesheet"
+                                type="object"
+                                context="{'current_sheet_id': parent.id}"
+                                attrs="{'invisible': [('timesheet_ids', '!=', [])]}"
+                            />
+                            <field name="priority" widget="priority" optional="show" />
+                            <field name="project_id" optional="show" />
+                            <field name="task_id" optional="show" />
+                            <field name="workload_id" optional="hide" />
+                            <field
+                                name="progress"
+                                widget="progressbar"
+                                optional="show"
+                            />
+
+                            <field
+                                name="timesheeted_hours"
+                                string="Timesheeted"
+                                decoration-bf="1"
+                                sum="Total Timesheeted"
+                                optional="show"
+                            />
+                            <field
+                                name="hours"
+                                string="Load"
+                                readonly="1"
+                                decoration-bf="1"
+                                sum="Total Load"
+                                optional="show"
+                            />
+                            <field
+                                name="remaining_hours"
+                                string="Remaining"
+                                decoration-bf="1"
+                                sum="Total Remaining"
+                                optional="hide"
+                            />
+                            <field name="task_stage_id" optional="show" />
+                            <button
+                                name="action_timesheet_time"
+                                decoration-muted="done"
+                                class="btn btn-secondary text-primary"
+                                title="Add 1 hour to timesheet"
+                                type="object"
+                                context="{'current_sheet_id': parent.id, 'time': 60}"
+                                attrs="{'column_invisible': [('parent.current', '=', False)]}"
+                                string="+1"
+                            />
+                            <button
+                                name="action_timesheet_time"
+                                decoration-muted="done"
+                                class="btn btn-secondary text-primary"
+                                title="Add 30 min to timesheet"
+                                type="object"
+                                context="{'current_sheet_id': parent.id, 'time': 30}"
+                                attrs="{'column_invisible': [('parent.current', '=', False)]}"
+                                string="+½"
+                            />
+                            <button
+                                name="action_timesheet_time"
+                                decoration-muted="done"
+                                class="btn btn-secondary text-primary"
+                                title="Add 15 min to timesheet"
+                                type="object"
+                                context="{'current_sheet_id': parent.id, 'time': 15}"
+                                attrs="{'column_invisible': [('parent.current', '=', False)]}"
+                                string="+¼"
+                            />
+                            <button
+                                name="action_timesheet_done"
+                                class="btn btn-secondary text-primary"
+                                icon="fa-check"
+                                title="This week's load is done for this workload"
+                                type="object"
+                                attrs="{'column_invisible': [('parent.current', '=', False)], 'invisible': [('done', '=', True)]}"
+                            />
+                        </tree>
+                    </field>
+                </div>
+            </sheet>
+        </field>
+    </record>
+</odoo>
diff --git a/project_workload_timesheet_additions/README.rst b/project_workload_timesheet_additions/README.rst
new file mode 100644
index 00000000..7ec95bb6
--- /dev/null
+++ b/project_workload_timesheet_additions/README.rst
@@ -0,0 +1,67 @@
+====================================
+Project Workload Timesheet Additions
+====================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:97cfdb2d70cb1fe62e8ab5f97743010162073b756b494792ce81a0ed541583b5
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet_additions
+    :alt: akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+This module adds additional workloads support in timesheets.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_timesheet_additions%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Contributors
+~~~~~~~~~~~~
+
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `akretion/ak-odoo-incubator <https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet_additions>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/project_workload_timesheet_additions/__init__.py b/project_workload_timesheet_additions/__init__.py
new file mode 100644
index 00000000..0650744f
--- /dev/null
+++ b/project_workload_timesheet_additions/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/project_workload_timesheet_additions/__manifest__.py b/project_workload_timesheet_additions/__manifest__.py
new file mode 100644
index 00000000..2456ac5f
--- /dev/null
+++ b/project_workload_timesheet_additions/__manifest__.py
@@ -0,0 +1,17 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Project Workload Timesheet Additions",
+    "summary": "Add Workload Additions To Timesheets",
+    "version": "16.0.1.0.0",
+    "development_status": "Alpha",
+    "category": "Uncategorized",
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "author": " Akretion",
+    "license": "AGPL-3",
+    "depends": ["project_workload_additions", "project_workload_timesheet"],
+    "data": ["views/hr_timesheet_sheet_views.xml"],
+    "auto_install": True,
+}
diff --git a/project_workload_timesheet_additions/models/__init__.py b/project_workload_timesheet_additions/models/__init__.py
new file mode 100644
index 00000000..bd28cf78
--- /dev/null
+++ b/project_workload_timesheet_additions/models/__init__.py
@@ -0,0 +1,3 @@
+from . import account_analytic_line
+from . import hr_timesheet_sheet
+from . import project_workload_unit
diff --git a/project_workload_timesheet_additions/models/account_analytic_line.py b/project_workload_timesheet_additions/models/account_analytic_line.py
new file mode 100644
index 00000000..a645f5d4
--- /dev/null
+++ b/project_workload_timesheet_additions/models/account_analytic_line.py
@@ -0,0 +1,37 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = "account.analytic.line"
+
+    workload_unit_id = fields.Many2one(
+        comodel_name="project.workload.unit",
+        string="Workload Unit",
+        readonly=False,
+        compute="_compute_workload_unit_id",
+        store=True,
+        domain="["
+        "('week', '=', week), "
+        "('user_id', '=', user_id), "
+        "('project_id', '=', project_id), "
+        "'|', "
+        "'&', ('additional_task_id', '=', False), ('task_id', '=', task_id), "
+        "('additional_task_id', '=', task_id)"
+        "]",
+    )
+
+    def _get_available_workload_units_domain(self):
+        return [
+            ("week", "=", self.week),
+            ("user_id", "=", self.user_id.id),
+            ("project_id", "=", self.project_id.id),
+            "|",
+            "&",
+            ("additional_task_id", "=", False),
+            ("task_id", "=", self.task_id.id),
+            ("additional_task_id", "=", self.task_id.id),
+        ]
diff --git a/project_workload_timesheet_additions/models/hr_timesheet_sheet.py b/project_workload_timesheet_additions/models/hr_timesheet_sheet.py
new file mode 100644
index 00000000..34aa71be
--- /dev/null
+++ b/project_workload_timesheet_additions/models/hr_timesheet_sheet.py
@@ -0,0 +1,8 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class Sheet(models.Model):
+    _inherit = "hr_timesheet.sheet"
diff --git a/project_workload_timesheet_additions/models/project_workload_unit.py b/project_workload_timesheet_additions/models/project_workload_unit.py
new file mode 100644
index 00000000..584c2509
--- /dev/null
+++ b/project_workload_timesheet_additions/models/project_workload_unit.py
@@ -0,0 +1,27 @@
+# Copyright 2024 Akretion (https://www.akretion.com).
+# @author Florian Mounier <florian.mounier@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProjectWorkloadUnit(models.Model):
+    _inherit = "project.workload.unit"
+    additional_workload_id = fields.Many2one(
+        "project.task.workload.addition",
+        "Additional Task Workload",
+        related="workload_id.additional_workload_id",
+        store=True,
+    )
+    additional_task_id = fields.Many2one(
+        "project.task",
+        "Additional Task",
+        related="workload_id.additional_workload_task_id",
+        store=True,
+    )
+
+    def _get_timesheeting_task(self):
+        # Timesheet in additional workload task
+        if self.additional_workload_id:
+            return self.additional_task_id
+        return super()._get_timesheeting_task()
diff --git a/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst b/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..292f457e
--- /dev/null
+++ b/project_workload_timesheet_additions/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Akretion <https://www.akretion.com>`_:
+  * BEAU Sébastien <sebastien.beau@akretion.com>
+  * Florian Mounier <florian.mounier@akretion.com>
diff --git a/project_workload_timesheet_additions/readme/DESCRIPTION.rst b/project_workload_timesheet_additions/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..b8dc49f0
--- /dev/null
+++ b/project_workload_timesheet_additions/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module adds additional workloads support in timesheets.
diff --git a/project_workload_timesheet_additions/static/description/index.html b/project_workload_timesheet_additions/static/description/index.html
new file mode 100644
index 00000000..8b96008e
--- /dev/null
+++ b/project_workload_timesheet_additions/static/description/index.html
@@ -0,0 +1,424 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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: https://docutils.sourceforge.io/" />
+<title>Project Workload Timesheet Additions</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="project-workload-timesheet-additions">
+<h1 class="title">Project Workload Timesheet Additions</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:97cfdb2d70cb1fe62e8ab5f97743010162073b756b494792ce81a0ed541583b5
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet_additions"><img alt="akretion/ak-odoo-incubator" src="https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github" /></a></p>
+<p>This module adds additional workloads support in timesheets.</p>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/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 to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/issues/new?body=module:%20project_workload_timesheet_additions%0Aversion:%2016.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">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.akretion.com">Akretion</a>:
+* BEAU Sébastien &lt;<a class="reference external" href="mailto:sebastien.beau&#64;akretion.com">sebastien.beau&#64;akretion.com</a>&gt;
+* Florian Mounier &lt;<a class="reference external" href="mailto:florian.mounier&#64;akretion.com">florian.mounier&#64;akretion.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/akretion/ak-odoo-incubator/tree/16.0/project_workload_timesheet_additions">akretion/ak-odoo-incubator</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/project_workload_timesheet_additions/views/hr_timesheet_sheet_views.xml b/project_workload_timesheet_additions/views/hr_timesheet_sheet_views.xml
new file mode 100644
index 00000000..a7cc82bc
--- /dev/null
+++ b/project_workload_timesheet_additions/views/hr_timesheet_sheet_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="hr_timesheet_sheet_form_my" model="ir.ui.view">
+        <field name="model">hr_timesheet.sheet</field>
+        <field
+            name="inherit_id"
+            ref="project_workload_timesheet.hr_timesheet_sheet_form_my"
+        />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//field[@name='workload_unit_ids']/tree/field[@name='task_id']"
+                position="after"
+            >
+                <field name="additional_task_id" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/setup/project_workload/odoo/addons/project_workload b/setup/project_workload/odoo/addons/project_workload
new file mode 120000
index 00000000..4b3d3182
--- /dev/null
+++ b/setup/project_workload/odoo/addons/project_workload
@@ -0,0 +1 @@
+../../../../project_workload
\ No newline at end of file
diff --git a/setup/project_workload/setup.py b/setup/project_workload/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/project_workload/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/project_workload_additions/odoo/addons/project_workload_additions b/setup/project_workload_additions/odoo/addons/project_workload_additions
new file mode 120000
index 00000000..793ba60a
--- /dev/null
+++ b/setup/project_workload_additions/odoo/addons/project_workload_additions
@@ -0,0 +1 @@
+../../../../project_workload_additions
\ No newline at end of file
diff --git a/setup/project_workload_additions/setup.py b/setup/project_workload_additions/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/project_workload_additions/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/project_workload_milestone/odoo/addons/project_workload_milestone b/setup/project_workload_milestone/odoo/addons/project_workload_milestone
new file mode 120000
index 00000000..e908b1d0
--- /dev/null
+++ b/setup/project_workload_milestone/odoo/addons/project_workload_milestone
@@ -0,0 +1 @@
+../../../../project_workload_milestone
\ No newline at end of file
diff --git a/setup/project_workload_milestone/setup.py b/setup/project_workload_milestone/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/project_workload_milestone/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/project_workload_timesheet/odoo/addons/project_workload_timesheet b/setup/project_workload_timesheet/odoo/addons/project_workload_timesheet
new file mode 120000
index 00000000..396e282f
--- /dev/null
+++ b/setup/project_workload_timesheet/odoo/addons/project_workload_timesheet
@@ -0,0 +1 @@
+../../../../project_workload_timesheet
\ No newline at end of file
diff --git a/setup/project_workload_timesheet/setup.py b/setup/project_workload_timesheet/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/project_workload_timesheet/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/project_workload_timesheet_additions/odoo/addons/project_workload_timesheet_additions b/setup/project_workload_timesheet_additions/odoo/addons/project_workload_timesheet_additions
new file mode 120000
index 00000000..b6e9a6a5
--- /dev/null
+++ b/setup/project_workload_timesheet_additions/odoo/addons/project_workload_timesheet_additions
@@ -0,0 +1 @@
+../../../../project_workload_timesheet_additions
\ No newline at end of file
diff --git a/setup/project_workload_timesheet_additions/setup.py b/setup/project_workload_timesheet_additions/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/project_workload_timesheet_additions/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)