From 0829316038e4555b0190317f8ce38d9608234bd9 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Thu, 9 Sep 2021 17:17:43 +0200
Subject: [PATCH 01/13] [IMP] sale_project: allow portal user to click on sale
 order button

Before this commit, in project sharing feature, when the portal user is
in task form view, he can see the sale order stat button if a sale order
is defined in the task but this button is disabled.

This commit allows the portal user to click on this stat button if he
has access to the sale order of task. If he cannot access then the stat
button will be invisible.
And if the portal user clicks on this button, he will be redirect to
`/my/orders/<id of the sale order>`.

task-2633229

Closes #82379
---
 addons/sale_project/models/project.py         | 32 +++++++++++++++++--
 .../views/project_sharing_views.xml           |  6 ++--
 .../views/project_sharing_views.xml           |  1 +
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/addons/sale_project/models/project.py b/addons/sale_project/models/project.py
index 6de2ed1c4c9..500ff4b709d 100644
--- a/addons/sale_project/models/project.py
+++ b/addons/sale_project/models/project.py
@@ -4,7 +4,7 @@
 from ast import literal_eval
 
 from odoo import api, fields, models, _
-from odoo.exceptions import ValidationError, UserError
+from odoo.exceptions import ValidationError, AccessError
 
 
 class Project(models.Model):
@@ -149,9 +149,12 @@ class ProjectTask(models.Model):
     invoice_count = fields.Integer("Number of invoices", related='sale_order_id.invoice_count')
     task_to_invoice = fields.Boolean("To invoice", compute='_compute_task_to_invoice', search='_search_task_to_invoice', groups='sales_team.group_sale_salesman_all_leads')
 
+    # Project sharing  fields
+    display_sale_order_button = fields.Boolean(string='Display Sales Order', compute='_compute_display_sale_order_button')
+
     @property
     def SELF_READABLE_FIELDS(self):
-        return super().SELF_READABLE_FIELDS | {'sale_order_id', 'sale_line_id'}
+        return super().SELF_READABLE_FIELDS | {'sale_order_id', 'sale_line_id', 'display_sale_order_button'}
 
     @api.depends('sale_line_id', 'project_id', 'commercial_partner_id')
     def _compute_sale_order_id(self):
@@ -177,6 +180,18 @@ class ProjectTask(models.Model):
             if task.sale_line_id.order_partner_id.commercial_partner_id != task.partner_id.commercial_partner_id:
                 task.sale_line_id = False
 
+    @api.depends('sale_order_id')
+    def _compute_display_sale_order_button(self):
+        if not self.sale_order_id:
+            self.display_sale_order_button = False
+            return
+        try:
+            sale_orders = self.env['sale.order'].search([('id', 'in', self.sale_order_id.ids)])
+            for task in self:
+                task.display_sale_order_button = task.sale_order_id in sale_orders
+        except AccessError:
+            self.display_sale_order_button = False
+
     @api.constrains('sale_line_id')
     def _check_sale_line_type(self):
         for task in self.sudo():
@@ -196,7 +211,6 @@ class ProjectTask(models.Model):
         return self.sale_order_id.ids
 
     def action_view_so(self):
-        self.ensure_one()
         so_ids = self._get_action_view_so_ids()
         action_window = {
             "type": "ir.actions.act_window",
@@ -212,6 +226,18 @@ class ProjectTask(models.Model):
 
         return action_window
 
+    def action_project_sharing_view_so(self):
+        self.ensure_one()
+        if self.user_has_groups('base.group_portal'):
+            if not self.display_sale_order_button:
+                return {}
+            return {
+                "name": "Portal Sale Order",
+                "type": "ir.actions.act_url",
+                "url": self.sale_order_id.access_url,
+            }
+        return self.action_view_so()
+
     def rating_get_partner_id(self):
         partner = self.partner_id or self.sale_line_id.order_id.partner_id
         if partner:
diff --git a/addons/sale_project/views/project_sharing_views.xml b/addons/sale_project/views/project_sharing_views.xml
index 85d4b1d8ca6..289b082f07b 100644
--- a/addons/sale_project/views/project_sharing_views.xml
+++ b/addons/sale_project/views/project_sharing_views.xml
@@ -7,10 +7,10 @@
         <field name="inherit_id" ref="project.project_sharing_project_task_view_form"/>
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <field name="sale_order_id" invisible="1"/>
+                <field name="display_sale_order_button" invisible="1"/>
                 <button class="d-none d-md-inline oe_stat_button"
-                        type="object" name="action_view_so" icon="fa-dollar"
-                        invisible="1"
+                        type="object" name="action_project_sharing_view_so" icon="fa-dollar"
+                        attrs="{'invisible': [('display_sale_order_button', '=', False)]}"
                         string="Sales Order"/>
             </div>
             <xpath expr="//field[@name='partner_id']" position="attributes">
diff --git a/addons/sale_timesheet/views/project_sharing_views.xml b/addons/sale_timesheet/views/project_sharing_views.xml
index 5580b34fdaf..33e6002d194 100644
--- a/addons/sale_timesheet/views/project_sharing_views.xml
+++ b/addons/sale_timesheet/views/project_sharing_views.xml
@@ -19,6 +19,7 @@
             <xpath expr="//field[@name='remaining_hours']" position="after">
                 <field name="allow_billable" invisible="1" />
                 <field name="remaining_hours_available" invisible="1"/>
+                <field name="sale_order_id" invisible="1"/>
                 <span id="remaining_hours_so_label" attrs="{'invisible': ['|', '|', '|', '|', ('allow_billable', '=', False), ('sale_order_id', '=', False), ('partner_id', '=', False), ('sale_line_id', '=', False), ('remaining_hours_available', '=', False)]}">
                     <label class="font-weight-bold" for="remaining_hours_so" string="Remaining Hours on SO"
                             attrs="{'invisible': ['|', ('encode_uom_in_days', '=', True), ('remaining_hours_so', '&lt;', 0)]}"/>

From 70e5f6ccbb8c2efdf3645cb129a7824454cb40d1 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Fri, 24 Sep 2021 11:19:42 +0200
Subject: [PATCH 02/13] [IMP] project: get parent task of another project in
 project sharing

Before this commit, the portal user can see the parent stat button in
project sharing form view of task if the parent is in the same project.
This button can be clicked and it redirects the user to the parent task
form view in the project sharing.

This commit improves this button and its visibility in project sharing
feature. The button is visible only if the current user has access to
the project of the parent task. That is the privacy visibility of the
project should be set to 'portal'. If the portal user has access to the
project of the parent task and he is not a collaborator of this project,
then the current user will be redirected to the classic portal view of
the parent task. If it is a collaborator then we display the parent task
in the project sharing feature.

task-2648955

Closes #82379
---
 addons/hr_timesheet/controllers/project.py    |  4 +--
 addons/project/controllers/portal.py          | 17 ++++++----
 addons/project/models/project.py              | 34 +++++++++++++++++++
 .../src/project_sharing/project_sharing.js    |  5 ++-
 .../views/project_sharing_templates.xml       |  2 +-
 .../project/views/project_sharing_views.xml   |  3 +-
 6 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/addons/hr_timesheet/controllers/project.py b/addons/hr_timesheet/controllers/project.py
index 970ae2fdb0f..102b6cfe530 100644
--- a/addons/hr_timesheet/controllers/project.py
+++ b/addons/hr_timesheet/controllers/project.py
@@ -10,8 +10,8 @@ from odoo.addons.project.controllers.portal import CustomerPortal
 
 class ProjectCustomerPortal(CustomerPortal):
 
-    def _prepare_project_sharing_session_info(self, project):
-        session_info = super()._prepare_project_sharing_session_info(project)
+    def _prepare_project_sharing_session_info(self, project, task=None):
+        session_info = super()._prepare_project_sharing_session_info(project, task)
 
         company = project.company_id
         timesheet_encode_uom = company.timesheet_encode_uom_id
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index 63cd3bd2a22..b7e108713d6 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -147,19 +147,22 @@ class ProjectCustomerPortal(CustomerPortal):
         return request.render("project.portal_my_projects", values)
 
     @http.route(['/my/project/<int:project_id>'], type='http', auth="public", website=True)
-    def portal_my_project(self, project_id=None, access_token=None, page=1, date_begin=None, date_end=None, sortby=None, search=None, search_in='content', groupby=None, **kw):
+    def portal_my_project(self, project_id=None, access_token=None, page=1, date_begin=None, date_end=None, sortby=None, search=None, search_in='content', groupby=None, task_id=None, **kw):
         try:
             project_sudo = self._document_check_access('project.project', project_id, access_token)
         except (AccessError, MissingError):
             return request.redirect('/my')
         if project_sudo.with_user(request.env.user)._check_project_sharing_access():
-            return request.render("project.project_sharing_portal", {'project_id': project_id})
+            values = {'project_id': project_id}
+            if task_id:
+                values['task_id'] = task_id
+            return request.render("project.project_sharing_portal", values)
         project_sudo = project_sudo if access_token else project_sudo.with_user(request.env.user)
         values = self._project_get_page_view_values(project_sudo, access_token, page, date_begin, date_end, sortby, search, search_in, groupby, **kw)
         values['task_url'] = 'project/%s/task' % project_id
         return request.render("project.portal_my_project", values)
 
-    def _prepare_project_sharing_session_info(self, project):
+    def _prepare_project_sharing_session_info(self, project, task=None):
         session_info = request.env['ir.http'].session_info()
         user_context = request.session.get_context() if request.session.uid else {}
         mods = conf.server_wide_modules or []
@@ -188,17 +191,19 @@ class ProjectCustomerPortal(CustomerPortal):
             # FIXME: See if we prefer to give only the currency that the portal user just need to see the correct information in project sharing
             currencies=request.env['ir.http'].get_currencies(),
         )
+        if task:
+            session_info['open_task_action'] = task.action_project_sharing_open_task()
         return session_info
 
     @http.route("/my/project/<int:project_id>/project_sharing", type="http", auth="user", methods=['GET'])
-    def render_project_backend_view(self, project_id):
+    def render_project_backend_view(self, project_id, task_id=None):
         project = request.env['project.project'].sudo().browse(project_id)
         if not project.exists() or not project.with_user(request.env.user)._check_project_sharing_access():
             return request.not_found()
-
+        task = task_id and request.env['project.task'].browse(int(task_id))
         return request.render(
             'project.project_sharing_embed',
-            {'session_info': self._prepare_project_sharing_session_info(project)},
+            {'session_info': self._prepare_project_sharing_session_info(project, task)},
         )
 
     @http.route('/my/project/<int:project_id>/task/<int:task_id>', type='http', auth='public', website=True)
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 00faf9fed40..29b2dbfc3f5 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -44,6 +44,7 @@ PROJECT_TASK_READABLE_FIELDS = {
     'legend_blocked',
     'legend_done',
     'user_ids',
+    'display_parent_task_button',
 }
 
 PROJECT_TASK_WRITABLE_FIELDS = {
@@ -1038,6 +1039,9 @@ class Task(models.Model):
                                      domain="[('allow_task_dependencies', '=', True), ('id', '!=', id)]")
     dependent_tasks_count = fields.Integer(string="Dependent Tasks", compute='_compute_dependent_tasks_count')
 
+    # Project sharing fields
+    display_parent_task_button = fields.Boolean(compute='_compute_display_parent_task_button', compute_sudo=True)
+
     # recurrence fields
     allow_recurring_tasks = fields.Boolean(related='project_id.allow_recurring_tasks')
     recurring_task = fields.Boolean(string="Recurrent")
@@ -1470,6 +1474,11 @@ class Task(models.Model):
         """
         return [('id', 'inselect', (query, [f'%{value}%']))]
 
+    def _compute_display_parent_task_button(self):
+        accessible_parent_tasks = self.parent_id.with_user(self.env.user)._filter_access_rules('read')
+        for task in self:
+            task.display_parent_task_button = task.parent_id in accessible_parent_tasks
+
     @api.returns('self', lambda value: value.id)
     def copy(self, default=None):
         if default is None:
@@ -2113,6 +2122,26 @@ class Task(models.Model):
             'context': self._context
         }
 
+    def action_project_sharing_view_parent_task(self):
+        if self.parent_id.project_id != self.project_id and self.user_has_groups('base.group_portal'):
+            project = self.parent_id.project_id._filter_access_rules_python('read')
+            if project:
+                url = f"/my/projects/{self.parent_id.project_id.id}/task/{self.parent_id.id}"
+                if project._check_project_sharing_access():
+                    url = f"/my/projects/{self.parent_id.project_id.id}?task_id={self.parent_id.id}"
+                return {
+                    "name": "Portal Parent Task",
+                    "type": "ir.actions.act_url",
+                    "url": url,
+                }
+            elif self.display_parent_task_button:
+                return self.parent_id.get_portal_url()
+            # The portal user has no access to the parent task, so normally the button should be invisible.
+            return {}
+        action = self.action_open_parent_task()
+        action['views'] = [(self.env.ref('project.project_sharing_project_task_view_form').id, 'form')]
+        return action
+
     # ------------
     # Actions
     # ------------
@@ -2126,6 +2155,11 @@ class Task(models.Model):
             'context': self._context
         }
 
+    def action_project_sharing_open_task(self):
+        action = self.action_open_task()
+        action['views'] = [[self.env.ref('project.project_sharing_project_task_view_form').id, 'form']]
+        return action
+
     def action_dependent_tasks(self):
         self.ensure_one()
         action = {
diff --git a/addons/project/static/src/project_sharing/project_sharing.js b/addons/project/static/src/project_sharing/project_sharing.js
index 0f9a53db202..98d4118cffd 100644
--- a/addons/project/static/src/project_sharing/project_sharing.js
+++ b/addons/project/static/src/project_sharing/project_sharing.js
@@ -43,7 +43,7 @@ export class ProjectSharingWebClient extends Component {
     }
 
     async _showView() {
-        const { action_name, project_id } = session;
+        const { action_name, project_id, open_task_action } = session;
         await this.actionService.doAction(
             action_name,
             {
@@ -53,6 +53,9 @@ export class ProjectSharingWebClient extends Component {
                 }
             }
         );
+        if (open_task_action) {
+            await this.actionService.doAction(open_task_action);
+        }
     }
 }
 
diff --git a/addons/project/views/project_sharing_templates.xml b/addons/project/views/project_sharing_templates.xml
index 38dda9405d8..3759ba7fcdf 100644
--- a/addons/project/views/project_sharing_templates.xml
+++ b/addons/project/views/project_sharing_templates.xml
@@ -9,7 +9,7 @@
     </template>
 
     <template id="project_sharing" name="Project Sharing View">
-        <iframe width="100%" height="100%" frameborder="0" t-attf-src="/my/project/{{ project_id }}/project_sharing"/>
+        <iframe width="100%" height="100%" frameborder="0" t-attf-src="/my/project/{{ project_id }}{{  '/' + task_id if task_id else '' }}/project_sharing"/>
     </template>
 
     <template id="project_sharing_embed" name="Project Sharing View Embed">
diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml
index 7281b29cda1..48d32910da9 100644
--- a/addons/project/views/project_sharing_views.xml
+++ b/addons/project/views/project_sharing_views.xml
@@ -159,7 +159,8 @@
                 </header>
                 <sheet string="Task">
                     <div class="oe_button_box" name="button_box">
-                        <button name="action_open_parent_task" type="object" special="cancel" class="oe_stat_button o_debounce_disabled" icon="fa-tasks" string="Parent Task" attrs="{'invisible': [('parent_id', '=', False)]}"/>
+                        <field name="display_parent_task_button" invisible="1"/>
+                        <button name="action_project_sharing_view_parent_task" type="object" class="oe_stat_button" icon="fa-tasks" string="Parent Task" attrs="{'invisible': [('display_parent_task_button', '=', False)]}"/>
                     </div>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title pr-0">

From b517fdc19d3a3530695895757679bdafb415e6e4 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Fri, 24 Sep 2021 11:30:42 +0200
Subject: [PATCH 03/13] [IMP] project: rename the portal form view route of
 project and task

Before this commit, when the current user is in the '/my/projects'
route and selects a project the route becomes '/my/project/<id of
project>'. There is no reason to change the route and then adding the id
of the project. In sales order route, we keep the route and we add the
id of the SO to see the portal form view of the SO selected.

This commit renames the route of project and task form view to keep the
same route and the same logic of SO and quotations routes for instance.

task-2648955

Closes #82379
---
 addons/project/controllers/portal.py          | 25 ++++++++++++++-----
 addons/project/models/project.py              |  4 +--
 .../views/project_portal_templates.xml        |  6 ++---
 .../views/project_sharing_templates.xml       |  2 +-
 odoo/addons/base/models/ir_http.py            |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index b7e108713d6..98de1ef43ae 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -63,7 +63,7 @@ class ProjectCustomerPortal(CustomerPortal):
         # task count
         task_count = Task.search_count(domain)
         # pager
-        url = "/my/project/%s" % project.id
+        url = "/my/projects/%s" % project.id
         pager = portal_pager(
             url=url,
             url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'groupby': groupby, 'search_in': search_in, 'search': search},
@@ -146,7 +146,20 @@ class ProjectCustomerPortal(CustomerPortal):
         })
         return request.render("project.portal_my_projects", values)
 
-    @http.route(['/my/project/<int:project_id>'], type='http', auth="public", website=True)
+    @http.route(['/my/project/<int:project_id>',
+                 '/my/project/<int:project_id>/page/<int:page>',
+                 '/my/project/<int:project_id>/task/<int:task_id>',
+                 '/my/project/<int:project_id>/project_sharing'], type='http', auth="public")
+    def portal_project_routes_outdated(self, **kwargs):
+        """ Redirect the outdated routes to the new routes. """
+        return request.redirect(request.httprequest.path.replace('/my/project/', '/my/projects/'))
+
+    @http.route(['/my/task', '/my/task/page/<int:page>'], type='http', auth='public')
+    def portal_my_task_routes_outdated(self, **kwargs):
+        """ Redirect the outdated routes to the new routes. """
+        return request.redirect(request.httprequest.path.replace('/my/task', '/my/tasks'))
+
+    @http.route(['/my/projects/<int:project_id>'], type='http', auth="public", website=True)
     def portal_my_project(self, project_id=None, access_token=None, page=1, date_begin=None, date_end=None, sortby=None, search=None, search_in='content', groupby=None, task_id=None, **kw):
         try:
             project_sudo = self._document_check_access('project.project', project_id, access_token)
@@ -195,7 +208,7 @@ class ProjectCustomerPortal(CustomerPortal):
             session_info['open_task_action'] = task.action_project_sharing_open_task()
         return session_info
 
-    @http.route("/my/project/<int:project_id>/project_sharing", type="http", auth="user", methods=['GET'])
+    @http.route("/my/projects/<int:project_id>/project_sharing", type="http", auth="user", methods=['GET'])
     def render_project_backend_view(self, project_id, task_id=None):
         project = request.env['project.project'].sudo().browse(project_id)
         if not project.exists() or not project.with_user(request.env.user)._check_project_sharing_access():
@@ -206,7 +219,7 @@ class ProjectCustomerPortal(CustomerPortal):
             {'session_info': self._prepare_project_sharing_session_info(project, task)},
         )
 
-    @http.route('/my/project/<int:project_id>/task/<int:task_id>', type='http', auth='public', website=True)
+    @http.route('/my/projects/<int:project_id>/task/<int:task_id>', type='http', auth='public', website=True)
     def portal_my_project_task(self, project_id=None, task_id=None, access_token=None, **kw):
         try:
             project_sudo = self._document_check_access('project.project', project_id, access_token)
@@ -414,7 +427,7 @@ class ProjectCustomerPortal(CustomerPortal):
             'grouped_tasks': grouped_tasks,
             'page_name': 'task',
             'default_url': '/my/tasks',
-            'task_url': 'task',
+            'task_url': 'tasks',
             'pager': pager,
             'searchbar_sortings': searchbar_sortings,
             'searchbar_groupby': searchbar_groupby,
@@ -433,7 +446,7 @@ class ProjectCustomerPortal(CustomerPortal):
         # The route should not be called if at least hr_timesheet is not installed
         raise MissingError(_('There is nothing to report.'))
 
-    @http.route(['/my/task/<int:task_id>'], type='http', auth="public", website=True)
+    @http.route(['/my/tasks/<int:task_id>'], type='http', auth="public", website=True)
     def portal_my_task(self, task_id, report_type=None, access_token=None, **kw):
         try:
             task_sudo = self._document_check_access('project.task', task_id, access_token)
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 29b2dbfc3f5..3e2565c0a44 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -364,7 +364,7 @@ class Project(models.Model):
     def _compute_access_url(self):
         super(Project, self)._compute_access_url()
         for project in self:
-            project.access_url = '/my/project/%s' % project.id
+            project.access_url = f'/my/projects/{project.id}'
 
     def _compute_access_warning(self):
         super(Project, self)._compute_access_warning()
@@ -1397,7 +1397,7 @@ class Task(models.Model):
     def _compute_access_url(self):
         super(Task, self)._compute_access_url()
         for task in self:
-            task.access_url = '/my/task/%s' % task.id
+            task.access_url = f'/my/tasks/{task.id}'
 
     def _compute_access_warning(self):
         super(Task, self)._compute_access_warning()
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index 17ea2b8d22b..f2fb8fb2edb 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -7,7 +7,7 @@
                 <t t-else="">Projects</t>
             </li>
             <li t-if="page_name == 'project_task' and project" class="breadcrumb-item active">
-                <a t-if="project" t-attf-href="/my/project/{{ project.id }}?{{ keep_query() }}"><t t-esc="project.name"/></a>
+                <a t-if="project" t-attf-href="/my/projects/{{ project.id }}?{{ keep_query() }}"><t t-esc="project.name"/></a>
             </li>
             <li t-elif="project" t-attf-class="breadcrumb-item #{'active ' if not project else ''} text-truncate col-8 col-lg-10">
                 <t t-esc="project.name"/>
@@ -61,7 +61,7 @@
                 <tbody>
                     <tr t-foreach="projects" t-as="project">
                         <td>
-                            <a t-attf-href="/my/project/#{project.id}?{{ keep_query() }}"><span t-field="project.name"/></a>
+                            <a t-attf-href="/my/projects/#{project.id}?{{ keep_query() }}"><span t-field="project.name"/></a>
                         </td>
                         <td class="text-right">
                             <t t-out="project.task_count_with_subtasks" />
@@ -262,7 +262,7 @@
                             </div>
                             <div class="row mb-4">
                                 <div class="col-12 col-md-6">
-                                    <div t-if="project_accessible"><strong>Project:</strong> <a t-attf-href="/my/project/#{task.project_id.id}" t-field="task.project_id"/></div>
+                                    <div t-if="project_accessible"><strong>Project:</strong> <a t-attf-href="/my/projects/#{task.project_id.id}" t-field="task.project_id"/></div>
                                     <div t-else=""><strong>Project:</strong> <a t-field="task.project_id"/></div>
                                     <div t-if="task.date_deadline"><strong>Deadline:</strong> <span t-field="task.date_deadline" t-options='{"widget": "date"}'/></div>
                                     <div name="portal_my_task_planned_hours">
diff --git a/addons/project/views/project_sharing_templates.xml b/addons/project/views/project_sharing_templates.xml
index 3759ba7fcdf..b0958ea5262 100644
--- a/addons/project/views/project_sharing_templates.xml
+++ b/addons/project/views/project_sharing_templates.xml
@@ -9,7 +9,7 @@
     </template>
 
     <template id="project_sharing" name="Project Sharing View">
-        <iframe width="100%" height="100%" frameborder="0" t-attf-src="/my/project/{{ project_id }}{{  '/' + task_id if task_id else '' }}/project_sharing"/>
+        <iframe width="100%" height="100%" frameborder="0" t-attf-src="/my/projects/{{ project_id }}/project_sharing{{  '?task_id=' + task_id if task_id else '' }}"/>
     </template>
 
     <template id="project_sharing_embed" name="Project Sharing View Embed">
diff --git a/odoo/addons/base/models/ir_http.py b/odoo/addons/base/models/ir_http.py
index 05724431263..454e7a33a9d 100644
--- a/odoo/addons/base/models/ir_http.py
+++ b/odoo/addons/base/models/ir_http.py
@@ -322,7 +322,7 @@ class IrHttp(models.AbstractModel):
                     record = record_sudo
                 elif self.env.user.has_group('base.group_portal'):
                     # Check the read access on the record linked to the attachment
-                    # eg: Allow to download an attachment on a task from /my/task/task_id
+                    # eg: Allow to download an attachment on a task from /my/tasks/task_id
                     record.check('read')
                     record = record_sudo
 

From 25ece8fe7b6cc6e554df530520116c68a98c0e82 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Tue, 28 Sep 2021 12:38:34 +0200
Subject: [PATCH 04/13] [IMP] project: refactor portal tasks routes

Before this commit, we recently added a new route in project portal
called '/my/projects/:project_id/tasks' to get the tasks related to the
project. The problem is most of the code in this route is duplicated
from the original route to see all tasks in portal view. That is, the
route called '/my/tasks'.

This commit refactors the code to have the common code in a common
method and changes the result in both routes to have the `values`
dictionary expected in those routes.

task-2648955

Closes #82379
---
 addons/project/controllers/portal.py | 207 +++++++++++----------------
 1 file changed, 83 insertions(+), 124 deletions(-)

diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index 98de1ef43ae..828f3e64a56 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -30,75 +30,19 @@ class ProjectCustomerPortal(CustomerPortal):
     # My Project
     # ------------------------------------------------------------
     def _project_get_page_view_values(self, project, access_token, page=1, date_begin=None, date_end=None, sortby=None, search=None, search_in='content', groupby=None, **kwargs):
-        # TODO: refactor this because most of this code is duplicated from portal_my_tasks method
-        values = self._prepare_portal_layout_values()
-        searchbar_sortings = self._task_get_searchbar_sortings()
-
-        searchbar_inputs = self._task_get_searchbar_inputs()
-        searchbar_groupby = self._task_get_searchbar_groupby()
-
-        # default sort by value
-        if not sortby:
-            sortby = 'date'
-        order = searchbar_sortings[sortby]['order']
-
         # default filter by value
         domain = [('project_id', '=', project.id)]
-
-        # default group by value
-        if not groupby:
-            groupby = 'project'
-
-        if date_begin and date_end:
-            domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
-
-        # search
-        if search and search_in:
-            domain += self._task_get_search_domain(search_in, search)
-
-        Task = request.env['project.task']
-        if access_token:
-            Task = Task.sudo()
-
-        # task count
-        task_count = Task.search_count(domain)
         # pager
         url = "/my/projects/%s" % project.id
-        pager = portal_pager(
-            url=url,
-            url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'groupby': groupby, 'search_in': search_in, 'search': search},
-            total=task_count,
-            page=page,
-            step=self._items_per_page
-        )
-        # content according to pager and archive selected
-        order = self._task_get_order(order, groupby)
-
-        tasks = Task.search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
-        request.session['my_project_tasks_history'] = tasks.ids[:100]
-
-        groupby_mapping = self._task_get_groupby_mapping()
-        group = groupby_mapping.get(groupby)
-        if group:
-            grouped_tasks = [Task.concat(*g) for k, g in groupbyelem(tasks, itemgetter(group))]
-        else:
-            grouped_tasks = [tasks]
+        values = self._prepare_tasks_values(page, date_begin, date_end, sortby, search, search_in, groupby, url, domain, su=bool(access_token))
+        pager = portal_pager(**values['pager'])
 
         values.update(
-            date=date_begin,
-            date_end=date_end,
-            grouped_tasks=grouped_tasks,
+            grouped_tasks=values['grouped_tasks'](pager['offset']),
             page_name='project',
-            default_url=url,
             pager=pager,
-            searchbar_sortings=searchbar_sortings,
-            searchbar_groupby=searchbar_groupby,
-            searchbar_inputs=searchbar_inputs,
-            search_in=search_in,
-            search=search,
-            sortby=sortby,
-            groupby=groupby,
             project=project,
+            task_url=f'projects/{project.id}/task',
         )
         return self._get_page_view_values(project, access_token, values, 'my_projects_history', False, **kwargs)
 
@@ -172,7 +116,6 @@ class ProjectCustomerPortal(CustomerPortal):
             return request.render("project.project_sharing_portal", values)
         project_sudo = project_sudo if access_token else project_sudo.with_user(request.env.user)
         values = self._project_get_page_view_values(project_sudo, access_token, page, date_begin, date_end, sortby, search, search_in, groupby, **kw)
-        values['task_url'] = 'project/%s/task' % project_id
         return request.render("project.portal_my_project", values)
 
     def _prepare_project_sharing_session_info(self, project, task=None):
@@ -338,20 +281,88 @@ class ProjectCustomerPortal(CustomerPortal):
             ])
         return OR(search_domain)
 
-    @http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
-    def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
+    def _prepare_tasks_values(self, page, date_begin, date_end, sortby, search, search_in, groupby, url="/my/tasks", domain=None, su=False):
         values = self._prepare_portal_layout_values()
-        searchbar_sortings = self._task_get_searchbar_sortings()
         searchbar_sortings = dict(sorted(self._task_get_searchbar_sortings().items(),
                                          key=lambda item: item[1]["sequence"]))
+        searchbar_inputs = self._task_get_searchbar_inputs()
+        searchbar_groupby = self._task_get_searchbar_groupby()
 
+        Task = request.env['project.task']
+        if su:
+            Task = Task.sudo()
+
+        if not domain:
+            domain = []
+
+        # default sort by value
+        if not sortby:
+            sortby = 'date'
+        order = searchbar_sortings[sortby]['order']
+
+        # default group by value
+        if not groupby:
+            groupby = 'project'
+
+        if date_begin and date_end:
+            domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
+
+        # search
+        if search and search_in:
+            domain += self._task_get_search_domain(search_in, search)
+
+        # content according to pager and archive selected
+        order = self._task_get_order(order, groupby)
+
+        def get_grouped_tasks(pager_offset):
+            tasks = Task.search(domain, order=order, limit=self._items_per_page, offset=pager_offset)
+            request.session['my_project_tasks_history' if url.startswith('/my/projects') else 'my_tasks_history'] = tasks.ids[:100]
+
+            groupby_mapping = self._task_get_groupby_mapping()
+            group = groupby_mapping.get(groupby)
+            if group:
+                grouped_tasks = [Task.concat(*g) for k, g in groupbyelem(tasks, itemgetter(group))]
+            else:
+                grouped_tasks = [tasks]
+
+            task_states = dict(Task._fields['kanban_state']._description_selection(request.env))
+            if sortby == 'status':
+                if groupby == 'none' and grouped_tasks:
+                    grouped_tasks[0] = grouped_tasks[0].sorted(lambda tasks: task_states.get(tasks.kanban_state))
+                else:
+                    grouped_tasks.sort(key=lambda tasks: task_states.get(tasks[0].kanban_state))
+            return grouped_tasks
+
+        values.update({
+            'date': date_begin,
+            'date_end': date_end,
+            'grouped_tasks': get_grouped_tasks,
+            'page_name': 'task',
+            'default_url': url,
+            'task_url': 'tasks',
+            'pager': {
+                "url": url,
+                "url_args": {'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'groupby': groupby, 'search_in': search_in, 'search': search},
+                "total": Task.search_count(domain),
+                "page": page,
+                "step": self._items_per_page
+            },
+            'searchbar_sortings': searchbar_sortings,
+            'searchbar_groupby': searchbar_groupby,
+            'searchbar_inputs': searchbar_inputs,
+            'search_in': search_in,
+            'search': search,
+            'sortby': sortby,
+            'groupby': groupby,
+        })
+        return values
+
+    @http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
+    def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
         searchbar_filters = {
             'all': {'label': _('All'), 'domain': []},
         }
 
-        searchbar_inputs = self._task_get_searchbar_inputs()
-        searchbar_groupby = self._task_get_searchbar_groupby()
-
         # extends filterby criteria with project the customer has access to
         projects = request.env['project.project'].search([])
         for project in projects:
@@ -370,72 +381,20 @@ class ProjectCustomerPortal(CustomerPortal):
                 str(proj_id): {'label': proj_name, 'domain': [('project_id', '=', proj_id)]}
             })
 
-        # default sort by value
-        if not sortby:
-            sortby = 'date'
-        order = searchbar_sortings[sortby]['order']
-
-        # default filter by value
         if not filterby:
             filterby = 'all'
         domain = searchbar_filters.get(filterby, searchbar_filters.get('all'))['domain']
 
-        # default group by value
-        if not groupby:
-            groupby = 'project'
+        values = self._prepare_tasks_values(page, date_begin, date_end, sortby, search, search_in, groupby, domain=domain)
 
-        if date_begin and date_end:
-            domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
-
-        # search
-        if search and search_in:
-            domain += self._task_get_search_domain(search_in, search)
-
-        # task count
-        task_count = request.env['project.task'].search_count(domain)
         # pager
-        pager = portal_pager(
-            url="/my/tasks",
-            url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby, 'groupby': groupby, 'search_in': search_in, 'search': search},
-            total=task_count,
-            page=page,
-            step=self._items_per_page
-        )
-        # content according to pager and archive selected
-        order = self._task_get_order(order, groupby)
-
-        tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
-        request.session['my_tasks_history'] = tasks.ids[:100]
-
-        groupby_mapping = self._task_get_groupby_mapping()
-        group = groupby_mapping.get(groupby)
-        if group:
-            grouped_tasks = [request.env['project.task'].concat(*g) for k, g in groupbyelem(tasks, itemgetter(group))]
-        else:
-            grouped_tasks = [tasks]
-
-        task_states = dict(request.env['project.task']._fields['kanban_state']._description_selection(request.env))
-        if sortby == 'status':
-            if groupby == 'none' and grouped_tasks:
-                grouped_tasks[0] = grouped_tasks[0].sorted(lambda tasks: task_states.get(tasks.kanban_state))
-            else:
-                grouped_tasks.sort(key=lambda tasks: task_states.get(tasks[0].kanban_state))
+        pager_vals = values['pager']
+        pager_vals['url_args'].update(filterby=filterby)
+        pager = portal_pager(**pager_vals)
 
         values.update({
-            'date': date_begin,
-            'date_end': date_end,
-            'grouped_tasks': grouped_tasks,
-            'page_name': 'task',
-            'default_url': '/my/tasks',
-            'task_url': 'tasks',
+            'grouped_tasks': values['grouped_tasks'](pager['offset']),
             'pager': pager,
-            'searchbar_sortings': searchbar_sortings,
-            'searchbar_groupby': searchbar_groupby,
-            'searchbar_inputs': searchbar_inputs,
-            'search_in': search_in,
-            'search': search,
-            'sortby': sortby,
-            'groupby': groupby,
             'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
             'filterby': filterby,
         })

From 336befc0fbdf8f24cedcb37ef7d4684aea50885c Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Tue, 28 Sep 2021 12:48:10 +0200
Subject: [PATCH 05/13] [FIX] project: add route to manage page in
 '/my/projects/:project_id'

Before this commit, we recently change the content of this route. The
content is the list of tasks to the project instead of the form view of
the project. The problem is we don't have a route to manage the page in
the case where we have more than the value stored in `_items_per_page`.

This commit adds a route in the method for '/my/projects/:project_id'
route. The new route is called '/my/projects/:project_id/page/:page' to
manage the page of the tasks linked to the project.

task-2648955

Closes #82379
---
 addons/project/controllers/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index 828f3e64a56..a6a5e1bbf7b 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -103,7 +103,7 @@ class ProjectCustomerPortal(CustomerPortal):
         """ Redirect the outdated routes to the new routes. """
         return request.redirect(request.httprequest.path.replace('/my/task', '/my/tasks'))
 
-    @http.route(['/my/projects/<int:project_id>'], type='http', auth="public", website=True)
+    @http.route(['/my/projects/<int:project_id>', '/my/projects/<int:project_id>/page/<int:page>'], type='http', auth="public", website=True)
     def portal_my_project(self, project_id=None, access_token=None, page=1, date_begin=None, date_end=None, sortby=None, search=None, search_in='content', groupby=None, task_id=None, **kw):
         try:
             project_sudo = self._document_check_access('project.project', project_id, access_token)

From 4220775a1dbddce8dd6696dd983961ebe33ad649 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Wed, 29 Sep 2021 15:10:21 +0200
Subject: [PATCH 06/13] [MOV] sale_project: move the invoice_count field in
 field service

Before this commit, the `invoice_count` field is defined in
`project.task` in `sale_project` but it is not used in this module.

This commit moves this field in enterprise version, because we use
this field in Field Service app.

task-2648955

Closes #82379
---
 addons/sale_project/models/project.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/sale_project/models/project.py b/addons/sale_project/models/project.py
index 500ff4b709d..1ecb6795abb 100644
--- a/addons/sale_project/models/project.py
+++ b/addons/sale_project/models/project.py
@@ -146,7 +146,6 @@ class ProjectTask(models.Model):
         domain="[('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done'])]",
         help="Sales Order Item to which the time spent on this task will be added, in order to be invoiced to your customer.")
     project_sale_order_id = fields.Many2one('sale.order', string="Project's sale order", related='project_id.sale_order_id')
-    invoice_count = fields.Integer("Number of invoices", related='sale_order_id.invoice_count')
     task_to_invoice = fields.Boolean("To invoice", compute='_compute_task_to_invoice', search='_search_task_to_invoice', groups='sales_team.group_sale_salesman_all_leads')
 
     # Project sharing  fields

From 1439a6f34daf049142eeb0f9e1d4a20590219b4a Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Thu, 30 Sep 2021 11:34:55 +0200
Subject: [PATCH 07/13] [IMP] account: prepare values for invoices in seperate
 method

Before this commit, the values dict given to the template of
'/my/invoices' is built in the main method of the '/my/invoices' route.

This commit moves the building of the values dict in a separate method
to easily use in another route/method.

task-2648955

Closes #82379
---
 addons/account/controllers/portal.py | 54 +++++++++++++++++-----------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/addons/account/controllers/portal.py b/addons/account/controllers/portal.py
index 06f758f3cf1..1d9e6294767 100644
--- a/addons/account/controllers/portal.py
+++ b/addons/account/controllers/portal.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import http, _
+from odoo.osv import expression
 from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 from odoo.exceptions import AccessError, MissingError
 from collections import OrderedDict
@@ -34,10 +35,29 @@ class PortalAccount(CustomerPortal):
 
     @http.route(['/my/invoices', '/my/invoices/page/<int:page>'], type='http', auth="user", website=True)
     def portal_my_invoices(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, **kw):
+        values = self._prepare_my_invoices_values(page, date_begin, date_end, sortby, filterby)
+
+        # pager
+        pager = portal_pager(**values['pager'])
+
+        # content according to pager and archive selected
+        invoices = values['invoices'](pager['offset'])
+        request.session['my_invoices_history'] = invoices.ids[:100]
+
+        values.update({
+            'invoices': invoices,
+            'pager': pager,
+        })
+        return request.render("account.portal_my_invoices", values)
+
+    def _prepare_my_invoices_values(self, page, date_begin, date_end, sortby, filterby, domain=None, url="/my/invoices"):
         values = self._prepare_portal_layout_values()
         AccountInvoice = request.env['account.move']
 
-        domain = self._get_invoices_domain()
+        domain = expression.AND([
+            domain or [],
+            self._get_invoices_domain(),
+        ])
 
         searchbar_sortings = {
             'date': {'label': _('Date'), 'order': 'invoice_date desc'},
@@ -63,32 +83,26 @@ class PortalAccount(CustomerPortal):
         if date_begin and date_end:
             domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)]
 
-        # count for pager
-        invoice_count = AccountInvoice.search_count(domain)
-        # pager
-        pager = portal_pager(
-            url="/my/invoices",
-            url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby},
-            total=invoice_count,
-            page=page,
-            step=self._items_per_page
-        )
-        # content according to pager and archive selected
-        invoices = AccountInvoice.search(domain, order=order, limit=self._items_per_page, offset=pager['offset'])
-        request.session['my_invoices_history'] = invoices.ids[:100]
-
         values.update({
             'date': date_begin,
-            'invoices': invoices,
+            # content according to pager and archive selected
+            # lambda function to get the invoices recordset when the pager will be defined in the main method of a route
+            'invoices': lambda pager_offset: AccountInvoice.search(domain, order=order, limit=self._items_per_page, offset=pager_offset),
             'page_name': 'invoice',
-            'pager': pager,
-            'default_url': '/my/invoices',
+            'pager': {  # vals to define the pager.
+                "url": url,
+                "url_args": {'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby},
+                "total": AccountInvoice.search_count(domain),
+                "page": page,
+                "step": self._items_per_page,
+            },
+            'default_url': url,
             'searchbar_sortings': searchbar_sortings,
             'sortby': sortby,
             'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
-            'filterby':filterby,
+            'filterby': filterby,
         })
-        return request.render("account.portal_my_invoices", values)
+        return values
 
     @http.route(['/my/invoices/<int:invoice_id>'], type='http', auth="public", website=True)
     def portal_my_invoice_detail(self, invoice_id, access_token=None, report_type=None, download=False, **kw):

From 94153e9765d167b3b9d208102dbec5027ec322ad Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Fri, 8 Oct 2021 17:58:02 +0200
Subject: [PATCH 08/13] [REF] project: refactor tour js for project sharing
 feature

Before this commit, we duplicate some steps of the tour js launched
with internal user to the tour js launched with portal user.

This commit avoid duplicating the steps. To do this, a list variable
stores the common steps of both tours and use this  list in both tour
js to avoid duplicating the steps in both tour js.

task-2648955

Closes #82379
---
 .../tests/tours/project_sharing_tour.js       | 89 ++++++-------------
 1 file changed, 29 insertions(+), 60 deletions(-)

diff --git a/addons/project/static/tests/tours/project_sharing_tour.js b/addons/project/static/tests/tours/project_sharing_tour.js
index b744f44f943..671f5c6a0e9 100644
--- a/addons/project/static/tests/tours/project_sharing_tour.js
+++ b/addons/project/static/tests/tours/project_sharing_tour.js
@@ -2,10 +2,7 @@
 
 import tour from 'web_tour.tour';
 
-tour.register('project_sharing_tour', {
-    test: true,
-    url: '/web',
-}, [...tour.stepUtils.goToAppSteps("project.menu_main_pm", 'Go to the Project App.'), {
+const projectSharingSteps = [...tour.stepUtils.goToAppSteps("project.menu_main_pm", 'Go to the Project App.'), {
     // an invisible element cannot be used as a trigger so this small hack is mandatory for the next step
     trigger: '.o_kanban_record:contains("Project Sharing")',
     run: function () {
@@ -39,6 +36,7 @@ tour.register('project_sharing_tour', {
         window.location.href = window.location.origin + '/my/projects';
     },
 }, {
+    id: 'project_sharing_feature',
     trigger: 'table > tbody > tr a:has(span:contains(Project Sharing))',
     content: 'Select "Project Sharing" project to go to project sharing feature for this project.',
 }, {
@@ -87,66 +85,37 @@ tour.register('project_sharing_tour', {
 }, {
     trigger: '.o_favorite_menu .o_add_favorite > button',
     content: 'click to "save current search" button in favorite menu',
+}, {
+    trigger: '.o_filter_menu > button',
+    content: 'click on filter menu in the search view',
+}, {
+    trigger: '.o_filter_menu > .dropdown-menu > .dropdown-item:first-child',
+    content: 'click on the first item in the filter menu',
+}, {
+    trigger: '.o_group_by_menu > button',
+    content: 'click on group by menu in the search view',
+}, {
+    trigger: '.o_group_by_menu > .dropdown-menu > .dropdown-item:first-child',
+    content: 'click on the first item in the group by menu',
+}, {
+    trigger: '.o_favorite_menu > button',
+    content: 'click on the favorite menu in the search view',
+}, {
+    trigger: '.o_favorite_menu .o_add_favorite > button',
+    content: 'click to "save current search" button in favorite menu',
 }, {
     trigger: 'button.o_switch_view.o_list',
     content: 'Go to the list view',
-    run: 'click',
-}]);
+}];
 
+tour.register('project_sharing_tour', {
+    test: true,
+    url: '/web',
+}, projectSharingSteps);
+
+// The begining of the project sharing feature
+const projectSharingStepIndex = projectSharingSteps.findIndex(s => s.id && s.id === 'project_sharing_feature');
 tour.register('portal_project_sharing_tour', {
     test: true,
     url: '/my/projects',
-}, [{
-    trigger: 'table > tbody > tr a:has(span:contains(Project Sharing))',
-    content: 'Select "Project Sharing" project to go to project sharing feature for this project.',
-}, {
-    trigger: '.o_project_sharing',
-    content: 'Wait the project sharing feature be loaded',
-    run: function () {},
-}, {
-    trigger: 'button.o-kanban-button-new',
-    content: 'Click "Create" button',
-    run: 'click',
-}, {
-    trigger: '.o_kanban_quick_create .o_field_widget[name="name"]',
-    content: 'Create Task',
-    run: 'text Test Create Task',
-}, {
-    trigger: '.o_kanban_quick_create .o_kanban_edit',
-    content: 'Go to the form view of this new task',
-}, {
-    trigger: 'div.o_statusbar_status[name="stage_id"] button[aria-checked="false"]:contains(Done)',
-    content: 'Change the stage of the task.',
-}, {
-    trigger: '.o_portal_chatter_composer_input .o_portal_chatter_composer_body textarea[name="message"]',
-    content: 'Write a message in the chatter of the task',
-    run: 'text I create a new task for testing purpose.',
-}, {
-    trigger: '.o_portal_chatter_composer_input .o_portal_chatter_composer_body button[data-action="/mail/chatter_post"]',
-    content: 'Send the message',
-}, {
-    trigger: 'ol.breadcrumb > li.o_back_button > a:contains(Project Sharing)',
-    content: 'Go back to the kanban view',
-}, {
-    trigger: '.o_filter_menu > button',
-    content: 'click on filter menu in the search view',
-}, {
-    trigger: '.o_filter_menu > .dropdown-menu > .dropdown-item:first-child',
-    content: 'click on the first item in the filter menu',
-}, {
-    trigger: '.o_group_by_menu > button',
-    content: 'click on group by menu in the search view',
-}, {
-    trigger: '.o_group_by_menu > .dropdown-menu > .dropdown-item:first-child',
-    content: 'click on the first item in the group by menu',
-}, {
-    trigger: '.o_favorite_menu > button',
-    content: 'click on the favorite menu in the search view',
-}, {
-    trigger: '.o_favorite_menu .o_add_favorite > button',
-    content: 'click to "save current search" button in favorite menu',
-}, {
-    trigger: 'button.o_switch_view.o_list',
-    content: 'Go to the list view',
-    run: 'click',
-}]);
+}, projectSharingSteps.slice(projectSharingStepIndex, projectSharingSteps.length));

From 4099571e24cdee8dbb4d3dab760c8fc3c3f5eeed Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Tue, 5 Oct 2021 18:07:24 +0200
Subject: [PATCH 09/13] [REV] project,mail: disable click on avatar

This reverts commit 0e1961b1dd16b335663236cdb9d76a92c09c3244 because the
`no_open_chat` option is removed, this commit becomes useless, that's
why the commit is revert.

task-2633229

Closes #82379
---
 addons/mail/static/src/js/m2x_avatar_user.js  |  10 +-
 .../static/tests/m2x_avatar_user_tests.js     | 104 ------------------
 .../project/views/project_sharing_views.xml   |   2 +-
 3 files changed, 4 insertions(+), 112 deletions(-)

diff --git a/addons/mail/static/src/js/m2x_avatar_user.js b/addons/mail/static/src/js/m2x_avatar_user.js
index 6dca143b4f2..ffa2f7f8751 100644
--- a/addons/mail/static/src/js/m2x_avatar_user.js
+++ b/addons/mail/static/src/js/m2x_avatar_user.js
@@ -31,7 +31,6 @@ const M2XAvatarMixin = {
             throw new Error(`This widget is only supported on many2one and many2many fields pointing to ${JSON.stringify(this.supportedModels)}`);
         }
         this.className = `${this.className || ''} o_clickable_m2x_avatar`.trim();
-        this.noOpenChat = this.nodeOptions.no_open_chat || false;
     },
 
     //--------------------------------------------------------------------------
@@ -46,11 +45,8 @@ const M2XAvatarMixin = {
      * @returns {Promise}
      */
     async _openChat(params) {
-        if (!this.noOpenChat) {
-            const messaging = await Component.env.services.messaging.get();
-            return messaging.openChat(params);
-        }
-        return Promise.resolve();
+        const messaging = await Component.env.services.messaging.get();
+        return messaging.openChat(params);
     },
 };
 
@@ -189,7 +185,7 @@ export const Many2OneAvatarUser = Many2OneAvatar.extend(M2XAvatarMixin, {
     _onAvatarClicked(ev) {
         ev.stopPropagation(); // in list view, prevent from opening the record
         this._openChat({ userId: this.value.res_id });
-    },
+    }
 });
 
 export const KanbanMany2OneAvatarUser = Many2OneAvatarUser.extend({
diff --git a/addons/mail/static/tests/m2x_avatar_user_tests.js b/addons/mail/static/tests/m2x_avatar_user_tests.js
index 78829683bbb..bfdfa6e9183 100644
--- a/addons/mail/static/tests/m2x_avatar_user_tests.js
+++ b/addons/mail/static/tests/m2x_avatar_user_tests.js
@@ -313,110 +313,6 @@ QUnit.module('mail', {}, function () {
         kanban.destroy();
     });
 
-    QUnit.test('many2one_avatar_user widget in list view with no_open_chat set to true', async function (assert) {
-        assert.expect(3);
-
-        const { widget: list } = await start({
-            hasView: true,
-            View: ListView,
-            model: 'foo',
-            data: this.data,
-            arch: `<tree><field name="user_id" widget="many2one_avatar_user" options="{'no_open_chat': 1}"/></tree>`,
-            mockRPC(route, args) {
-                if (args.method === 'read') {
-                    assert.step(`read ${args.model} ${args.args[0]}`);
-                }
-                return this._super(...arguments);
-            },
-        });
-
-        mock.intercept(list, 'open_record', () => {
-            assert.step('open record');
-        });
-
-        assert.strictEqual(list.$('.o_data_cell span').text(), 'MarioLuigiMarioYoshi');
-
-        // sanity check: later on, we'll check that clicking on the avatar doesn't open the record
-        await dom.click(list.$('.o_data_row:first span'));
-
-        await dom.click(list.$('.o_data_cell:nth(0) .o_m2o_avatar > img'));
-        await dom.click(list.$('.o_data_cell:nth(1) .o_m2o_avatar > img'));
-        await dom.click(list.$('.o_data_cell:nth(2) .o_m2o_avatar > img'));
-
-
-        assert.verifySteps([
-            'open record',
-        ]);
-
-        list.destroy();
-    });
-
-    QUnit.test('many2one_avatar_user widget in kanban view', async function (assert) {
-        assert.expect(3);
-
-        const { widget: kanban } = await start({
-            hasView: true,
-            View: KanbanView,
-            model: 'foo',
-            data: this.data,
-            arch: `
-                <kanban>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div>
-                                <field name="user_id" widget="many2one_avatar_user" options="{'no_open_chat': 1}"/>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>`,
-        });
-
-        assert.strictEqual(kanban.$('.o_kanban_record').text().trim(), '');
-        assert.containsN(kanban, '.o_m2o_avatar', 4);
-        dom.click(kanban.$('.o_m2o_avatar:nth(0) > img'));
-        dom.click(kanban.$('.o_m2o_avatar:nth(1) > img'));
-        dom.click(kanban.$('.o_m2o_avatar:nth(2) > img'));
-        dom.click(kanban.$('.o_m2o_avatar:nth(3) > img'));
-
-        assert.verifySteps([], "no read res.user should be done since we don't want to open chat when the user clicks on avatar.");
-
-        kanban.destroy();
-    });
-
-    QUnit.test('many2many_avatar_user widget in form view', async function (assert) {
-        assert.expect(5);
-
-        const { widget: form } = await start({
-            hasView: true,
-            View: FormView,
-            model: 'foo',
-            data: this.data,
-            arch: `<form><field name="user_ids" widget="many2many_avatar_user" options="{'no_open_chat': 1}"/></form>`,
-            mockRPC(route, args) {
-                if (args.method === 'read') {
-                    assert.step(`read ${args.model} ${args.args[0]}`);
-                }
-                return this._super(...arguments);
-            },
-            res_id: 1,
-        });
-
-        assert.containsN(form, '.o_field_many2manytags.avatar.o_field_widget .badge', 2,
-            "should have 2 records");
-        assert.strictEqual(form.$('.o_field_many2manytags.avatar.o_field_widget .badge:first img').data('src'), '/web/image/res.users/11/avatar_128',
-            "should have correct avatar image");
-
-        await dom.click(form.$('.o_field_many2manytags.avatar .badge:first .o_m2m_avatar'));
-        await dom.click(form.$('.o_field_many2manytags.avatar .badge:nth(1) .o_m2m_avatar'));
-
-        assert.verifySteps([
-            "read foo 1",
-            'read res.users 11,23',
-        ]);
-
-        form.destroy();
-    });
-
     QUnit.test('many2one_avatar_user widget edited by the smart action "Assign to..."', async function (assert) {
         assert.expect(4);
 
diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml
index 48d32910da9..7a0a6164622 100644
--- a/addons/project/views/project_sharing_views.xml
+++ b/addons/project/views/project_sharing_views.xml
@@ -103,7 +103,7 @@
                                     </span>
                                     <field name="kanban_state" widget="state_selection"/>
                                     <!-- TODO: [XBO] remove me in master -->
-                                    <field name="user_ids" string="Assignees" widget="many2many_avatar_user" options="{'no_open_chat': True}" invisible="1"/>
+                                    <field name="user_ids" string="Assignees" widget="many2many_avatar_user" invisible="1"/>
                                 </div>
                             </div>
                         </div>

From c2b0656c12dcba3b564c7a562b78d7ea7092be0d Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Wed, 15 Dec 2021 18:51:02 +0100
Subject: [PATCH 10/13] [IMP] sale: create some hook methods to avoid
 duplicating code

This commit moves some code used in methods for `/my/quotes` and
`/my/orders` because the code was duplicated for the both routes.
So, with this commit, we can now call those hooks when we need this code
in another routes.

task-2648955

Closes #82379
---
 addons/sale/controllers/portal.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py
index acedaadf124..3d662c016fc 100644
--- a/addons/sale/controllers/portal.py
+++ b/addons/sale/controllers/portal.py
@@ -39,6 +39,13 @@ class CustomerPortal(portal.CustomerPortal):
     # Quotations and Sales Orders
     #
 
+    def _get_sale_searchbar_sortings(self):
+        return {
+            'date': {'label': _('Order Date'), 'order': 'date_order desc'},
+            'name': {'label': _('Reference'), 'order': 'name'},
+            'stage': {'label': _('Stage'), 'order': 'state'},
+        }
+
     @http.route(['/my/quotes', '/my/quotes/page/<int:page>'], type='http', auth="user", website=True)
     def portal_my_quotes(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
         values = self._prepare_portal_layout_values()
@@ -50,12 +57,7 @@ class CustomerPortal(portal.CustomerPortal):
             ('state', 'in', ['sent', 'cancel'])
         ]
 
-        searchbar_sortings = {
-            'date': {'label': _('Order Date'), 'order': 'date_order desc'},
-            'name': {'label': _('Reference'), 'order': 'name'},
-            'stage': {'label': _('Stage'), 'order': 'state'},
-        }
-
+        searchbar_sortings = self._get_sale_searchbar_sortings()
         # default sortby order
         if not sortby:
             sortby = 'date'
@@ -100,11 +102,7 @@ class CustomerPortal(portal.CustomerPortal):
             ('state', 'in', ['sale', 'done'])
         ]
 
-        searchbar_sortings = {
-            'date': {'label': _('Order Date'), 'order': 'date_order desc'},
-            'name': {'label': _('Reference'), 'order': 'name'},
-            'stage': {'label': _('Stage'), 'order': 'state'},
-        }
+        searchbar_sortings = self._get_sale_searchbar_sortings()
         # default sortby order
         if not sortby:
             sortby = 'date'

From 97d477b0a0fa2ec0d3ee67f4823fbef41f55323c Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 31 Jan 2022 12:30:00 +0100
Subject: [PATCH 11/13] [IMP] project: add subtasks stat button in project
 sharing form view

Before this commit, the "Sub-tasks" has been added in the basic form
view of project.task in backend.

This commit adds this stat button in the project sharing form view to
have the same button than the one in backend.

task-2648955

Closes #82379
---
 addons/project/controllers/portal.py          | 52 ++++++++++++++++---
 addons/project/models/project.py              | 16 ++++++
 .../views/project_portal_templates.xml        | 14 ++++-
 .../project/views/project_sharing_views.xml   | 44 ++++++++++++++++
 4 files changed, 118 insertions(+), 8 deletions(-)

diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py
index a6a5e1bbf7b..7737d1dc153 100644
--- a/addons/project/controllers/portal.py
+++ b/addons/project/controllers/portal.py
@@ -11,7 +11,7 @@ from odoo.http import request
 from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 from odoo.tools import groupby as groupbyelem
 
-from odoo.osv.expression import OR
+from odoo.osv.expression import OR, AND
 
 from odoo.addons.web.controllers.main import HomeStaticTemplateHelpers
 
@@ -177,6 +177,38 @@ class ProjectCustomerPortal(CustomerPortal):
         values['project'] = project_sudo
         return request.render("project.portal_my_task", values)
 
+    @http.route('/my/projects/<int:project_id>/task/<int:task_id>/subtasks', type='http', auth='user', methods=['GET'], website=True)
+    def portal_my_project_subtasks(self, project_id, task_id, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
+        try:
+            project_sudo = self._document_check_access('project.project', project_id)
+            task_sudo = request.env['project.task'].search([('project_id', '=', project_id), ('id', '=', task_id)]).sudo()
+            task_domain = [('id', 'child_of', task_id), ('id', '!=', task_id)]
+            searchbar_filters = self._get_my_tasks_searchbar_filters([('id', '=', task_sudo.project_id.id)], task_domain)
+
+            if not filterby:
+                filterby = 'all'
+            domain = searchbar_filters.get(filterby, searchbar_filters.get('all'))['domain']
+
+            values = self._prepare_tasks_values(page, date_begin, date_end, sortby, search, search_in, groupby, url=f'/my/projects/{project_id}/task/{task_id}/subtasks', domain=AND([task_domain, domain]))
+            values['page_name'] = 'project_subtasks'
+
+            # pager
+            pager_vals = values['pager']
+            pager_vals['url_args'].update(filterby=filterby)
+            pager = portal_pager(**pager_vals)
+
+            values.update({
+                'project': project_sudo,
+                'task': task_sudo,
+                'grouped_tasks': values['grouped_tasks'](pager['offset']),
+                'pager': pager,
+                'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())),
+                'filterby': filterby,
+            })
+            return request.render("project.portal_my_tasks", values)
+        except (AccessError, MissingError):
+            return request.not_found()
+
     # ------------------------------------------------------------
     # My Task
     # ------------------------------------------------------------
@@ -357,14 +389,13 @@ class ProjectCustomerPortal(CustomerPortal):
         })
         return values
 
-    @http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
-    def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
+    def _get_my_tasks_searchbar_filters(self, project_domain=None, task_domain=None):
         searchbar_filters = {
             'all': {'label': _('All'), 'domain': []},
         }
 
         # extends filterby criteria with project the customer has access to
-        projects = request.env['project.project'].search([])
+        projects = request.env['project.project'].search(project_domain or [])
         for project in projects:
             searchbar_filters.update({
                 str(project.id): {'label': project.name, 'domain': [('project_id', '=', project.id)]}
@@ -372,7 +403,7 @@ class ProjectCustomerPortal(CustomerPortal):
 
         # extends filterby criteria with project (criteria name is the project id)
         # Note: portal users can't view projects they don't follow
-        project_groups = request.env['project.task'].read_group([('project_id', 'not in', projects.ids)],
+        project_groups = request.env['project.task'].read_group(AND([[('project_id', 'not in', projects.ids)], task_domain or []]),
                                                                 ['project_id'], ['project_id'])
         for group in project_groups:
             proj_id = group['project_id'][0] if group['project_id'] else False
@@ -380,6 +411,11 @@ class ProjectCustomerPortal(CustomerPortal):
             searchbar_filters.update({
                 str(proj_id): {'label': proj_name, 'domain': [('project_id', '=', proj_id)]}
             })
+        return searchbar_filters
+
+    @http.route(['/my/tasks', '/my/tasks/page/<int:page>'], type='http', auth="user", website=True)
+    def portal_my_tasks(self, page=1, date_begin=None, date_end=None, sortby=None, filterby=None, search=None, search_in='content', groupby=None, **kw):
+        searchbar_filters = self._get_my_tasks_searchbar_filters()
 
         if not filterby:
             filterby = 'all'
@@ -406,7 +442,7 @@ class ProjectCustomerPortal(CustomerPortal):
         raise MissingError(_('There is nothing to report.'))
 
     @http.route(['/my/tasks/<int:task_id>'], type='http', auth="public", website=True)
-    def portal_my_task(self, task_id, report_type=None, access_token=None, **kw):
+    def portal_my_task(self, task_id, report_type=None, access_token=None, project_sharing=False, **kw):
         try:
             task_sudo = self._document_check_access('project.task', task_id, access_token)
         except (AccessError, MissingError):
@@ -418,5 +454,9 @@ class ProjectCustomerPortal(CustomerPortal):
         # ensure attachment are accessible with access token inside template
         for attachment in task_sudo.attachment_ids:
             attachment.generate_access_token()
+        if project_sharing is True:
+            # Then the user arrives to the stat button shown in form view of project.task and the portal user can see only 1 task
+            # so the history should be reset.
+            request.session['my_tasks_history'] = task_sudo.ids
         values = self._task_get_page_view_values(task_sudo, access_token, **kw)
         return request.render("project.portal_my_task", values)
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 3e2565c0a44..fd26fbea16b 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -2160,6 +2160,22 @@ class Task(models.Model):
         action['views'] = [[self.env.ref('project.project_sharing_project_task_view_form').id, 'form']]
         return action
 
+    def action_project_sharing_open_subtasks(self):
+        self.ensure_one()
+        subtasks = self.env['project.task'].search([('id', 'child_of', self.id), ('id', '!=', self.id)])
+        if subtasks.project_id == self.project_id:
+            action = self.env['ir.actions.act_window']._for_xml_id('project.project_sharing_project_task_action_sub_task')
+            if len(subtasks) == 1:
+                action['view_mode'] = 'form'
+                action['views'] = [(view_id, view_type) for view_id, view_type in action['views'] if view_type == 'form']
+                action['res_id'] = subtasks.id
+            return action
+        return {
+            'name': 'Portal Sub-tasks',
+            'type': 'ir.actions.act_url',
+            'url': f'/my/projects/{self.project_id.id}/task/{self.id}/subtasks' if len(subtasks) > 1 else subtasks.get_portal_url(query_string='project_sharing=1'),
+        }
+
     def action_dependent_tasks(self):
         self.ensure_one()
         action = {
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index f2fb8fb2edb..2e055e463d1 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -6,7 +6,7 @@
                 <a t-if="project" t-attf-href="/my/projects?{{ keep_query() }}">Projects</a>
                 <t t-else="">Projects</t>
             </li>
-            <li t-if="page_name == 'project_task' and project" class="breadcrumb-item active">
+            <li t-if="page_name in ['project_task', 'project_subtasks'] and project" class="breadcrumb-item active">
                 <a t-if="project" t-attf-href="/my/projects/{{ project.id }}?{{ keep_query() }}"><t t-esc="project.name"/></a>
             </li>
             <li t-elif="project" t-attf-class="breadcrumb-item #{'active ' if not project else ''} text-truncate col-8 col-lg-10">
@@ -16,9 +16,19 @@
                 <a t-if="task" t-attf-href="/my/tasks?{{ keep_query() }}">Tasks</a>
                 <t t-else="">Tasks</t>
             </li>
-            <li t-if="task" class="breadcrumb-item active text-truncate">
+            <li t-if="page_name == 'project_subtasks' and task and project" class="breadcrumb-item active">
+                <a t-attf-href="/my/projects/{{ project.id }}/task/{{ task.id }}?{{ keep_query() }}"><t t-esc="task.name"/></a>
+            </li>
+            <li t-elif="task" class="breadcrumb-item active text-truncate">
                 <span t-field="task.name"/>
             </li>
+            <li t-if="page_name == 'project_subtasks' or (task and subtask and project)" t-attf-class="breadcrumb-item text-truncate #{'active ' if not subtask else ''}">
+                <a t-if="subtask" t-attf-href="/my/tasks/{{ task.id }}/subtasks?{{ keep_query() }}">Sub-tasks</a>
+                <t t-else="">Sub-tasks</t>
+            </li>
+            <li t-if="subtask" class="breadcrumb-item active text-truncate">
+                <span t-field="subtask.name"/>
+            </li>
         </xpath>
     </template>
 
diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml
index 7a0a6164622..f5e0ff3ef8a 100644
--- a/addons/project/views/project_sharing_views.xml
+++ b/addons/project/views/project_sharing_views.xml
@@ -161,6 +161,15 @@
                     <div class="oe_button_box" name="button_box">
                         <field name="display_parent_task_button" invisible="1"/>
                         <button name="action_project_sharing_view_parent_task" type="object" class="oe_stat_button" icon="fa-tasks" string="Parent Task" attrs="{'invisible': [('display_parent_task_button', '=', False)]}"/>
+                        <button name="action_project_sharing_open_subtasks" type="object" class="oe_stat_button" icon="fa-tasks"
+                            attrs="{'invisible' : ['|', '|', ('allow_subtasks', '=', False), ('id', '=', False), ('subtask_count', '=', 0)]}" context="{'default_user_ids': [(6, 0, [uid])]}">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_value">
+                                    <field name="subtask_count" widget="statinfo" nolabel="1"/>
+                                </span>
+                                <span class="o_stat_text">Sub-tasks</span>
+                            </div>
+                        </button>
                     </div>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title pr-0">
@@ -305,4 +314,39 @@
         <field name="view_id" ref="project.project_sharing_project_task_view_form"/>
     </record>
 
+    <record id="project_sharing_project_task_action_sub_task" model="ir.actions.act_window">
+        <field name="name">Sub-tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="view_mode">tree,kanban,form</field>
+        <field name="search_view_id" ref="project.project_sharing_project_task_view_search"/>
+        <field name="domain">[('id', 'child_of', active_id), ('id', '!=', active_id)]</field>
+        <field name="context">{'default_parent_id': active_id}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                No tasks found. Let's create one!
+            </p><p>
+                To get things done, use activities and status on tasks.<br/>
+                Chat in real time or by email to collaborate efficiently.
+            </p>
+        </field>
+    </record>
+
+    <record id="project_sharing_subtasks_tree_action_view" model="ir.actions.act_window.view">
+        <field name="view_mode">tree</field>
+        <field name="act_window_id" ref="project.project_sharing_project_task_action_sub_task"/>
+        <field name="view_id" ref="project.project_sharing_project_task_view_tree"/>
+    </record>
+
+    <record id="project_sharing_subtasks_kanban_action_view" model="ir.actions.act_window.view">
+        <field name="view_mode">kanban</field>
+        <field name="act_window_id" ref="project.project_sharing_project_task_action_sub_task"/>
+        <field name="view_id" ref="project.project_sharing_project_task_view_kanban"/>
+    </record>
+
+    <record id="project_sharing_subtasks_form_action_view" model="ir.actions.act_window.view">
+        <field name="view_mode">form</field>
+        <field name="act_window_id" ref="project.project_sharing_project_task_action_sub_task"/>
+        <field name="view_id" ref="project.project_sharing_project_task_view_form"/>
+    </record>
+
 </odoo>

From 2db820a1711c47da94a3c3acc4825f2a5ebd6456 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 31 Jan 2022 15:41:30 +0100
Subject: [PATCH 12/13] [IMP] hr_timesheet: remove overtime filter in project
 sharing

task-2633229

Closes #82379
---
 addons/hr_timesheet/views/project_sharing_views.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/hr_timesheet/views/project_sharing_views.xml b/addons/hr_timesheet/views/project_sharing_views.xml
index 2ca497a296e..e380958599c 100644
--- a/addons/hr_timesheet/views/project_sharing_views.xml
+++ b/addons/hr_timesheet/views/project_sharing_views.xml
@@ -161,15 +161,4 @@
         </field>
     </record>
 
-    <record id="project_sharing_inherit_project_task_view_search" model="ir.ui.view">
-        <field name="name">project.sharing.inherit.project.task.view.search</field>
-        <field name="model">project.task</field>
-        <field name="inherit_id" ref="project.project_sharing_project_task_view_search"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='late']" position='after'>
-                <filter string="Tasks in Overtime" name="overtime" domain="[('overtime', '&gt;', 0)]"/>
-            </xpath>
-        </field>
-    </record>
-
 </odoo>

From 78d3387a76472adcfabd3ddb9e366362d8214acb Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Fri, 11 Feb 2022 15:15:59 +0100
Subject: [PATCH 13/13] [IMP] project: update webclient in project sharing to
 OWL 2

task-2633229

Closes #82379
---
 .../static/src/project_sharing/project_sharing.xml    | 11 ++++-------
 addons/project/views/project_sharing_templates.xml    |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/project/static/src/project_sharing/project_sharing.xml b/addons/project/static/src/project_sharing/project_sharing.xml
index 9f021f9530d..3ebf4fe49ef 100644
--- a/addons/project/static/src/project_sharing/project_sharing.xml
+++ b/addons/project/static/src/project_sharing/project_sharing.xml
@@ -2,13 +2,10 @@
 <templates xml:space="preserve">
 
     <t t-name="project.ProjectSharingWebClient" owl="1">
-        <body class="o_project_sharing">
-            <NotUpdatable>
-                <ActionContainer />
-            </NotUpdatable>
-            <div class="o_dialog_container"/>
-            <MainComponentsContainer/>
-        </body>
+        <NotUpdatable>
+            <ActionContainer />
+        </NotUpdatable>
+        <MainComponentsContainer/>
     </t>
 
 </templates>
diff --git a/addons/project/views/project_sharing_templates.xml b/addons/project/views/project_sharing_templates.xml
index b0958ea5262..4b3b9a29a8a 100644
--- a/addons/project/views/project_sharing_templates.xml
+++ b/addons/project/views/project_sharing_templates.xml
@@ -27,7 +27,7 @@
                 <t t-call="web.conditional_assets_tests"/>
             </t>
             <t t-set="head" t-value="head_project_sharing + (head or '')"/>
-            <t t-set="body_classname" t-value="'o_web_client'"/>
+            <t t-set="body_classname" t-value="'o_web_client o_project_sharing'"/>
         </t>
     </template>