From 0302a262c830cb7cb39b6d934034dbc592a7d236 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 6 Sep 2021 14:55:39 +0200
Subject: [PATCH 1/9] [IMP] project: rename the See more button into Edit
 project in kanban

Before this commit, we rename the 'Edit' button into 'See more' but we
prefer to directly edit the project when we click on this button
So, it is to have 'Edit' as name and directly enter in the form view of
the project in edit mode.

This commit renames the button into 'Edit'.

task-2638359
closes #76166

X-original-commit: e960b2966bdd16f369df9fbd8e4cf372c37bd37a
---
 addons/project/models/project.py                     | 12 ++----------
 .../static/tests/tours/project_update_tour_tests.js  |  2 +-
 addons/project/views/project_views.xml               |  3 ++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 4223b57fc9b..ff476912391 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -628,16 +628,8 @@ class Project(models.Model):
         }
 
     def action_view_kanban_project(self):
-        self.ensure_one()
-        return {
-            'res_model': 'project.project',
-            'type': 'ir.actions.act_window',
-            'name': _("Project"),
-            'res_id': self.id,
-            'views': [(self.env.ref('project.edit_project').id, 'form')],
-            'view_mode': 'form',
-            'context': {'form_view_initial_mode': 'readonly'}
-        }
+        # [XBO] TODO: remove me in master
+        return
 
     # ---------------------------------------------
     #  PROJECT UPDATES
diff --git a/addons/project/static/tests/tours/project_update_tour_tests.js b/addons/project/static/tests/tours/project_update_tour_tests.js
index ae9c3fe0ccf..c363d2d84df 100644
--- a/addons/project/static/tests/tours/project_update_tour_tests.js
+++ b/addons/project/static/tests/tours/project_update_tour_tests.js
@@ -85,7 +85,7 @@ tour.register('project_update_tour', {
     trigger: '.oe_kanban_global_click :contains("New Project") .o_dropdown_kanban',
     content: 'Open the project dropdown'
 }, {
-    trigger: '.o_kanban_record:contains("New Project") .dropdown-menu a:contains("See More")',
+    trigger: '.o_kanban_record:contains("New Project") .dropdown-menu a:contains("Edit")',
     content: 'Start editing the project',
 }, {
     trigger: '.nav-item:contains("Invoicing") .nav-link',
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 1832f225bf1..c383ab81aba 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -676,7 +676,8 @@
                                             </div>
                                             <div role="menuitem" class="col-4">
                                                 <a t-if="record.privacy_visibility.raw_value == 'portal'" class="dropdown-item" role="menuitem" name="%(project.project_share_wizard_action)d" type="action">Share</a>
-                                                <a class="dropdown-item" role="menuitem" type="object" name="action_view_kanban_project">See More</a>
+                                                <!-- [XBO] TODO: remove the name attribute in this a tag in master -->
+                                                <a class="dropdown-item" role="menuitem" type="edit" name="action_view_kanban_project">Edit</a>
                                             </div>
                                         </div>
                                     </div>

From 1ba83ad0eede2e5c30f0e3ae6a5df1ed570e950e Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 6 Sep 2021 13:14:24 +0200
Subject: [PATCH 2/9] [IMP] sale_timesheet: hide 'Invoicing' tab in project
 when no partner

Before this commit, when the partner is not defined in the project, we
show the 'Invoicing' tab only when the project is billable
(allow_billable=True) and the user could select an SOL and we
automatically set the project customer to the one in the SOL.

This commit directly hides the 'Invoicing' tab in the project form view
when no customer is defined or the project is not billable.
Now, if the project is billable, then the user will have to define the
customer to have this tab.

task-2638359
closes #76166

X-original-commit: ca40b7d804aef2dfa8eb1aad183979a7219b4270
---
 .../static/tests/tours/sale_timesheet_tour.js      | 14 +++++++-------
 addons/sale_timesheet/views/project_task_views.xml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index 33ecfdeb765..acfe2888120 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -178,13 +178,6 @@ tour.register('sale_timesheet_tour', {
             actions.click(this.$anchor);
         }
     }
-}, {
-    trigger: 'div.o_notebook_headers',
-    content: 'Click on Invoicing tab to configure the invoicing of this project.',
-    run: function (actions) {
-        const notebookId = $('div[name="sale_line_id"]').closest("div.tab-pane").attr('id');
-        actions.click(this.$anchor.find(`a[data-toggle="tab"][href="#${notebookId}"]`));
-    },
 }, {
     trigger: 'div[name="partner_id"]',
     content: Markup('Add the customer for this project to select an SO and SOL for this customer <i>(e.g. Brandon Freeman)</i>.'),
@@ -195,6 +188,13 @@ tour.register('sale_timesheet_tour', {
     trigger: 'ul.o_partner_autocomplete_dropdown > li:first-child > a:contains(Freeman)',
     content: 'Select the customer in the autocomplete dropdown',
     run: 'click',
+}, {
+    trigger: 'div.o_notebook_headers',
+    content: 'Click on Invoicing tab to configure the invoicing of this project.',
+    run: function (actions) {
+        const notebookId = $('div[name="sale_line_id"]').closest("div.tab-pane").attr('id');
+        actions.click(this.$anchor.find(`a[data-toggle="tab"][href="#${notebookId}"]`));
+    },
 }, {
     trigger: 'div[name="sale_line_id"]',
     content: 'Select a Sales Order Item as Default Sales Order Item for each task in this project.',
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index b5ba5e96fcd..53721e0f4df 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -27,7 +27,7 @@
                 <button name="action_make_billable" string="Create Sales Order" type="object" attrs="{'invisible': [('display_create_order', '=', False)]}" groups="sales_team.group_sale_salesman"/>
             </xpath>
             <xpath expr="//page[@name='settings']" position="after">
-                <page name="billing_employee_rate" string="Invoicing" attrs="{'invisible': [('allow_billable', '=', False)]}">
+                <page name="billing_employee_rate" string="Invoicing" attrs="{'invisible': ['|', ('allow_billable', '=', False), ('partner_id', '=', False)]}">
                     <group>
                         <group>
                             <field name="display_create_order" invisible="1"/>

From 2fa26c4fd8e2d116a7973c995cd5492897cec4ed Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 6 Sep 2021 15:05:52 +0200
Subject: [PATCH 3/9] [FIX] sale_timesheet: not filter project template based
 pricing type

Before this commit, in the product, the user can select one of
billable projects with `allow_timesheets=True` and `pricing_type='task_rate'`
but the pricing type is not useful now, since we don't have anymore the
`bill_type` and `pricing_type` fields visible. Now the pricing_type is
computed based on the SOL and employee mappings on the project.

This commit removes the pricing type in the domain for
`project_template_id` field in product model. So, now the user can
select a project billable with `allow_timesheets=True`.

task-2638359
closes #76166

X-original-commit: ac32f966672c2e3f29f639e441781a5bc6c396e0
---
 addons/sale_timesheet/models/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_timesheet/models/product.py b/addons/sale_timesheet/models/product.py
index f2f6b5f82c9..18b8bed87cb 100644
--- a/addons/sale_timesheet/models/product.py
+++ b/addons/sale_timesheet/models/product.py
@@ -27,7 +27,7 @@ class ProductTemplate(models.Model):
     ], ondelete={'timesheet': 'set default'})
     # override domain
     project_id = fields.Many2one(domain="[('company_id', '=', current_company_id), ('allow_billable', '=', True), ('pricing_type', '=', 'task_rate'), ('allow_timesheets', 'in', [service_policy == 'delivered_timesheet', True])]")
-    project_template_id = fields.Many2one(domain="[('company_id', '=', current_company_id), ('allow_billable', '=', True), ('pricing_type', '!=', 'task_rate'), ('allow_timesheets', 'in', [service_policy == 'delivered_timesheet', True])]")
+    project_template_id = fields.Many2one(domain="[('company_id', '=', current_company_id), ('allow_billable', '=', True), ('allow_timesheets', 'in', [service_policy == 'delivered_timesheet', True])]")
     service_upsell_threshold = fields.Float('Threshold', default=1, help="Percentage of time delivered compared to the prepaid amount that must be reached for the upselling opportunity activity to be triggered.")
     service_upsell_threshold_ratio = fields.Char(compute='_compute_service_upsell_threshold_ratio')
 

From bf6f91eab90d6da2eb496b2247837a1aebd37468 Mon Sep 17 00:00:00 2001
From: Thibault Libioulle <tle@odoo.com>
Date: Mon, 6 Sep 2021 15:52:57 +0200
Subject: [PATCH 4/9] [IMP] project: add dependent tasks stat button

This commit adds a stat button representing the number of dependent
tasks, the current task is blocking.

This is the inverse relation of "Blocked by".

task-2638359
closes #76166

X-original-commit: d841e4a7e25fd56c49c0cd3b51994a7fda4cbc8b
---
 addons/project/models/project.py       | 32 ++++++++++++++++++++++++++
 addons/project/views/project_views.xml |  9 ++++++++
 2 files changed, 41 insertions(+)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index ff476912391..d1fc2292d97 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -1012,6 +1012,7 @@ class Task(models.Model):
     dependent_ids = fields.Many2many('project.task', relation="task_dependencies_rel", column1="depends_on_id",
                                      column2="task_id", string="Block",
                                      domain="[('allow_task_dependencies', '=', True), ('id', '!=', id)]")
+    dependent_tasks_count = fields.Integer(string="Dependent Tasks", compute='_compute_dependent_tasks_count')
 
     # recurrence fields
     allow_recurring_tasks = fields.Boolean(related='project_id.allow_recurring_tasks')
@@ -1267,6 +1268,21 @@ class Task(models.Model):
         for task in recurring_tasks:
             task.recurring_count = tasks_count.get(task.recurrence_id.id, 0)
 
+    @api.depends('dependent_ids')
+    def _compute_dependent_tasks_count(self):
+        tasks_with_dependency = self.filtered('allow_task_dependencies')
+        (self - tasks_with_dependency).dependent_tasks_count = 0
+        if tasks_with_dependency:
+            group_dependent = self.env['project.task'].read_group([
+                ('depend_on_ids', 'in', tasks_with_dependency.ids),
+            ], ['depend_on_ids'], ['depend_on_ids'])
+            dependent_tasks_count_dict = {
+                group['depend_on_ids'][0]: group['depend_on_ids_count']
+                for group in group_dependent
+            }
+            for task in tasks_with_dependency:
+                task.dependent_tasks_count = dependent_tasks_count_dict.get(task.id, 0)
+
     @api.depends('partner_id.email')
     def _compute_partner_email(self):
         for task in self:
@@ -2001,6 +2017,22 @@ class Task(models.Model):
             'context': self._context
         }
 
+    def action_dependent_tasks(self):
+        self.ensure_one()
+        action = {
+            'res_model': 'project.task',
+            'type': 'ir.actions.act_window',
+            'context': {**self._context, 'default_depend_on_ids': [Command.link(self.id)]},
+        }
+        if self.dependent_tasks_count == 1:
+            action['view_mode'] = 'form'
+            action['res_id'] = self.dependent_ids.id
+        else:
+            action['name'] = _('Dependent Tasks')
+            action['view_mode'] = 'tree,form,kanban,calendar,pivot,graph,gantt,activity,map'
+            action['domain'] = [('depend_on_ids', '=', self.id)]
+        return action
+
     def action_recurring_tasks(self):
         return {
             'name': 'Tasks in Recurrence',
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index c383ab81aba..f2ce34e3133 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -807,6 +807,15 @@
                                 <span class="o_stat_text">in Recurrence</span>
                             </div>
                         </button>
+                        <button name="action_dependent_tasks" type="object" attrs="{'invisible': [('dependent_tasks_count', '=', 0)]}" class="oe_stat_button" icon="fa-tasks" groups="project.group_project_task_dependencies">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_text">Blocking</span>
+                                <span class="o_stat_value ">
+                                    <field name="dependent_tasks_count" widget="statinfo" nolabel="1" />
+                                    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">

From 9ed5f1e64df27adba65082ddb0294f5c8cf2f136 Mon Sep 17 00:00:00 2001
From: Thibault Libioulle <tle@odoo.com>
Date: Mon, 6 Sep 2021 16:04:40 +0200
Subject: [PATCH 5/9] [IMP] project: sort updates by date

With this commit, project updates are sorted depending on their date
rather than the create date.

task-2638359
closes #76166

X-original-commit: b65edac046bb7fea649474d2282e0afa2d6f5703
---
 addons/project/models/project_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/models/project_update.py b/addons/project/models/project_update.py
index e09d300f290..0aa8672320d 100644
--- a/addons/project/models/project_update.py
+++ b/addons/project/models/project_update.py
@@ -19,7 +19,7 @@ STATUS_COLOR = {
 class ProjectUpdate(models.Model):
     _name = 'project.update'
     _description = 'Project Update'
-    _order = 'create_date desc'
+    _order = 'date desc'
     _inherit = ['mail.thread.cc', 'mail.activity.mixin']
 
     def default_get(self, fields):

From 5b51f369aabcc269412b1f8a490f55fd0461f210 Mon Sep 17 00:00:00 2001
From: "Xavier BOL (xbo)" <xbo@odoo.com>
Date: Mon, 6 Sep 2021 16:00:40 +0200
Subject: [PATCH 6/9] [IMP] project: change the analytic account name when
 project one changes

Before this commit, when the user changes the project name, we don't
change the one in analytic account linked even if the analytic account
is only linked to one project.

This commit also changes the name of the analytic account when the
project name changes and the analytic account is linked to only one
project.

task-2638359
closes #76166

X-original-commit: de9fbbd4228a35c4fecef8be42477416cfcbdd8d
---
 addons/project/models/project.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index d1fc2292d97..665ee2b7bb9 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -476,6 +476,18 @@ class Project(models.Model):
                 project.message_subscribe(project.partner_id.ids)
         if vals.get('privacy_visibility'):
             self._change_privacy_visibility()
+        if 'name' in vals and self.analytic_account_id:
+            projects_read_group = self.env['project.project'].read_group(
+                [('analytic_account_id', 'in', self.analytic_account_id.ids)],
+                ['analytic_account_id'],
+                ['analytic_account_id']
+            )
+            analytic_account_to_update = self.env['account.analytic.account'].browse([
+                res['analytic_account_id'][0]
+                for res in projects_read_group
+                if res['analytic_account_id'] and res['analytic_account_id_count'] == 1
+            ])
+            analytic_account_to_update.write({'name': self.name})
         return res
 
     def action_unlink(self):

From 942c64df672288306494757f0abab5023c47355e Mon Sep 17 00:00:00 2001
From: "Cedric Prieels (cpr)" <cpr@odoo.com>
Date: Tue, 7 Sep 2021 10:20:18 +0200
Subject: [PATCH 7/9] [MOV] project,sale_timesheet: move sale project tour
 steps

Elements referring to the sales order from the project module have been
removed from the project update js tour and moved to sale_timesheet
tour.

task-2638359
closes #76166

X-original-commit: 0b9d5b4a9c5552e22bb6a8f89b0e492330a034fd
---
 .../tests/tours/project_update_tour_tests.js  |  91 -------------
 .../static/tests/tours/sale_timesheet_tour.js | 123 ++++++++++++++++--
 2 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/addons/project/static/tests/tours/project_update_tour_tests.js b/addons/project/static/tests/tours/project_update_tour_tests.js
index c363d2d84df..39932655efc 100644
--- a/addons/project/static/tests/tours/project_update_tour_tests.js
+++ b/addons/project/static/tests/tours/project_update_tour_tests.js
@@ -72,91 +72,9 @@ tour.register('project_update_tour', {
     trigger: ".o_kanban_record .oe_kanban_content",
     extra_trigger: '.o_kanban_project_tasks',
     run: "drag_and_drop .o_kanban_group:eq(1) ",
-}, {
-    trigger: '.o_back_button',
-    content: 'Go back to edit the project created',
-}, {
-    // an invisible element cannot be used as a trigger so this small hack is mandatory for the next step
-    trigger: '.o_kanban_record:contains("New Project")',
-    run: function () {
-        $('.o_kanban_record:contains("New Project") .o_dropdown_kanban').css('visibility', 'visible');
-    }
-}, {
-    trigger: '.oe_kanban_global_click :contains("New Project") .o_dropdown_kanban',
-    content: 'Open the project dropdown'
-}, {
-    trigger: '.o_kanban_record:contains("New Project") .dropdown-menu a:contains("Edit")',
-    content: 'Start editing the project',
-}, {
-    trigger: '.nav-item:contains("Invoicing") .nav-link',
-    content: 'Start the assignement of a default sale order id to the project'
-}, {
-    trigger: '.o_form_button_edit',
-    content: 'Start editing the project'
-}, {
-    trigger: 'div[name="sale_line_id"]',
-    content: 'Select the first sale order of the list',
-    run: function (actions) {
-        actions.text('Prepaid', this.$anchor.find('input'));
-    },
-}, {
-    trigger: 'ul.ui-autocomplete > li:first-child > a',
-    content: 'Select the first item on the autocomplete dropdown'
-}, {
-    trigger: '.o_form_button_save',
-    content: 'Save the modifications'
-}, { 
-    trigger: '.o_back_button',
-    content: 'Go back to the kanban view the project created',
-}, {
-    trigger: '.oe_kanban_global_click :contains("New Project")',
-    content: 'Open the project'
 }, {    
     trigger: ".o_project_updates_breadcrumb",
     content: 'Open Updates'
-}, {
-    trigger: ".oe_button_box .o_stat_text:contains('Sales Order')",
-    run: function () {}
-}, {
-    trigger: ".o_rightpanel_title:eq(0):contains('Sold')",
-    content: 'Check the user sees Sold section',
-    run: function () {}
-}, {
-    trigger: ".o_rightpanel_left_text:eq(0):contains('Prepaid Hours')",
-    content: 'Check the user sees Sold subsection',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_title:eq(1):contains('Total Sold')",
-    content: 'Check the user sees Total Sold section',
-    run: function () {}
-}, {
-    trigger: ".o_rightpanel_header:eq(1) .o_rightpanel_right_col:contains('Hours')",
-    content: 'Check the user sees Total Sold hours title',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_section:eq(2) .o_rightpanel_data_row:contains('Effective')",
-    content: 'Check the user sees Total Sold subsection row',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_section:eq(2) .o_rightpanel_data_row:contains('Remaining')",
-    content: 'Check the user sees Total Sold subsection row',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_title:eq(2):contains('Profitability')",
-    content: 'Check the user sees Profitability section',
-    run: function () {}
-}, {
-    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Revenues')",
-    content: 'Check the user sees Profitability subsection row',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Costs')",
-    content: 'Check the user sees Profitability subsection row',
-    run: function () {},
-}, {
-    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Margin')",
-    content: 'Check the user sees Profitability subsection row',
-    run: function () {},
 }, {
     trigger: ".o_add_milestone a",
     content: "Add a first milestone"
@@ -205,15 +123,6 @@ tour.register('project_update_tour', {
 }, {
     trigger: ".o_field_widget[name=description] h1:contains('Activities')",
     run: function () {},
-}, {
-    trigger: ".o_field_widget[name=description] h3:contains('Sold')",
-    run: function () {},
-    }, {
-    trigger: ".o_field_widget[name=description] td:contains('Customer Care')",
-    run: function () {},
-}, {
-    trigger: ".o_field_widget[name=description] h3:contains('Profitability')",
-    run: function () {},
 }, {
     trigger: ".o_field_widget[name=description] h3:contains('Milestones')",
     run: function () {},
diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index acfe2888120..6e1fa4176f7 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -61,7 +61,7 @@ tour.register('sale_timesheet_tour', {
     run: function (actions) {
         actions.text('Project for Freeman', this.$anchor);
     },
-},  {
+}, {
     trigger: 'button[name="action_view_tasks"]',
     content: 'Click on Create button to create and enter to this newest project.',
     run: 'click',
@@ -239,36 +239,135 @@ tour.register('sale_timesheet_tour', {
     content: 'Save Project',
 }, {
     trigger: 'li[data-menu-xmlid="project.menu_projects"]',
-    content: 'Select Projects'
+    content: 'Select Projects',
 }, {
+    // an invisible element cannot be used as a trigger so this small hack is mandatory for the next step
     trigger: 'div.o_kanban_primary_left :contains("Project for Freeman")',
-    content: 'Select Project for Freeman'
+    content: 'Open the project dropdown',
+    run: function () {
+        $('.o_kanban_record:contains("Project for Freeman") .o_dropdown_kanban').css('visibility', 'visible');
+    },
+}, {
+    trigger: '.oe_kanban_global_click :contains("Project for Freeman") .o_dropdown_kanban',
+    content: 'Open the project dropdown',
+}, {
+    trigger: '.o_kanban_record:contains("Project for Freeman") .dropdown-menu a:contains("Edit")',
+    content: 'Start editing the project',
+}, {
+    trigger: 'div.o_notebook_headers',
+    content: 'Click on Invoicing tab to configure the invoicing of this project.',
+    run: function (actions) {
+        const notebookId = $('div[name="sale_line_id"]').closest("div.tab-pane").attr('id');
+        actions.click(this.$anchor.find(`a[data-toggle="tab"][href="#${notebookId}"]`));
+    },
+}, {
+    trigger: 'div[name="sale_line_id"]',
+    content: 'Select the first sale order of the list',
+    run: function (actions) {
+        actions.text('Prepaid', this.$anchor.find('input'));
+    },
+}, {
+    trigger: 'ul.ui-autocomplete > li:first-child > a',
+    content: 'Select the first item on the autocomplete dropdown',
+}, {
+    trigger: '.o_form_button_save',
+    content: 'Save the modifications',
+}, {
+    trigger: '.o_back_button',
+    content: 'Go back to the kanban view the project created',
+}, {
+    trigger: '.oe_kanban_global_click :contains("Project for Freeman")',
+    content: 'Open the project',
 }, {
     trigger: ".o_project_updates_breadcrumb",
-    content: 'Open Updates'
+    content: 'Open Updates',
 }, {
     trigger: ".o_rightpanel_title:eq(0):contains('Sold')",
-    content: 'Check the user sees Sold section'
+    content: 'Check the user sees Sold section',
+    run: function () {},
 }, {
     trigger: ".o_rightpanel_left_text:eq(0):contains('Prepaid Hours')",
     content: 'Check the user sees Sold subsection',
     run: function () {},
-},  {
+}, {
     trigger: ".o_rightpanel_title:eq(1):contains('Total Sold')",
-    content: 'Check the user sees Total Sold section'
+    content: 'Check the user sees Total Sold section',
+    run: function () {},
+}, {
+    trigger: ".oe_button_box .o_stat_text:contains('Sales Order')",
+    content: 'Check the user sees Sales Order Stat Button',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_header:eq(1) .o_rightpanel_right_col:contains('Hours')",
+    content: 'Check the user sees Hours title',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_section:eq(2) .o_rightpanel_data_row:contains('Effective')",
+    content: 'Check the user sees Effective subsection row',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_section:eq(2) .o_rightpanel_data_row:contains('Remaining')",
+    content: 'Check the user sees Remaining subsection row',
+    run: function () {},
 }, {
     trigger: ".o_rightpanel_title:eq(2):contains('Profitability')",
-    content: 'Check the user sees Profitability section'
+    content: 'Check the user sees Profitability section',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Revenues')",
+    content: 'Check the user sees Profitability subsection row',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Costs')",
+    content: 'Check the user sees Profitability subsection row',
+    run: function () {},
+}, {
+    trigger: ".o_rightpanel_section:eq(3) .o_rightpanel_data_row:contains('Margin')",
+    content: 'Check the user sees Profitability subsection row',
+    run: function () {},
 }, {
     trigger: ".o_rightpanel_title:eq(3):contains('Milestones')",
-    content: 'Check the user sees Milestones section'
+    content: 'Check the user sees Milestones section',
 }, {
-    trigger: ".o-kanban-button-new"
+    trigger: ".o_add_milestone a",
+    content: "Add a first milestone",
 }, {
     trigger: "input.o_field_widget[name=name]",
-    run: 'text New update'
+    content: "Edit new Milestone",
+    run: 'text New milestone',
 }, {
-    trigger: ".o_form_button_save"
+    trigger: "input.datetimepicker-input[name=deadline]",
+    content: "Edit new Milestone",
+    run: 'text 12/12/2099',
+}, {
+    trigger: ".modal-footer button",
+    content: "Save new Milestone",
+}, {
+    trigger: ".o-kanban-button-new",
+    content: "Create new Project Update",
+}, {
+    trigger: "input.o_field_widget[name=name]",
+    content: "Give a name to Project Update",
+    run: 'text New update',
+}, {
+    trigger: ".o_form_button_save",
+    content: "Save Project Update",
+}, {
+    trigger: ".o_field_widget[name=description] h3:contains('Sold')",
+    content: "Sold title must be in description in description",
+    run: function () {},
+    }, {
+    trigger: ".o_field_widget[name=description] td:contains('Prepaid Hours')",
+    content: "Prepaid Hours title must be in description",
+    run: function () {},
+}, {
+    trigger: ".o_field_widget[name=description] h3:contains('Profitability')",
+    content: "Profitability title must be in description",
+    run: function () {},
+}, {
+    trigger: ".o_field_widget[name=description] h3:contains('Milestones')",
+    content: "Milestones title must be in description",
+    run: function () {},
 }]);
 
 });

From 4ed77405e408dacdc22e7ea61a67d365e29127d5 Mon Sep 17 00:00:00 2001
From: "Laurent Stukkens (LTU)" <ltu@odoo.com>
Date: Fri, 10 Sep 2021 12:54:18 +0200
Subject: [PATCH 8/9] [FIX] project: change user_id into user_ids in various
 view and reports

The `user_id` field was replaced in odoo/odoo#74087 by `user_ids`.
The field change was forgotten in various reports and the a wizard.

This commit fixes those.

task-2638359
closes #76166

X-original-commit: f584485f0c69eda002491ca9b63bc3d228e95001
---
 addons/hr_timesheet/report/project_report_view.xml   |  4 ++--
 addons/project/report/project_report.py              |  5 ++---
 addons/project/report/project_report_views.xml       | 10 +++++-----
 .../report/project_task_burndown_chart_report.py     | 12 ++----------
 .../project_task_burndown_chart_report_views.xml     |  3 ---
 addons/project/wizard/project_task_type_delete.py    |  2 +-
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/addons/hr_timesheet/report/project_report_view.xml b/addons/hr_timesheet/report/project_report_view.xml
index 698c22704a7..fe3fdaf6a76 100644
--- a/addons/hr_timesheet/report/project_report_view.xml
+++ b/addons/hr_timesheet/report/project_report_view.xml
@@ -39,7 +39,7 @@
                     <filter string="Tasks in Overtime" name="overtime" domain="[('task_id.overtime', '&gt;', 0)]"/>
                 </xpath>
                 <xpath expr="//filter[@name='my_tasks']" position="before">
-                    <filter string="My Team's Projects" name="my_team_projects"  domain="[('project_id.user_id.employee_id.parent_id.user_id', '=', uid), ('project_id.user_id', '!=', uid), ('user_id', '!=', uid), ('user_id', '!=', False)]"/>
+                    <filter string="My Team's Projects" name="my_team_projects"  domain="[('project_id.user_id.employee_id.parent_id.user_id', '=', uid), ('project_id.user_id', '!=', uid), ('user_ids', '!=', uid), ('user_ids', '!=', False)]"/>
                 </xpath>
                 <xpath expr="//filter[@name='my_tasks']" position="after">
                     <filter string="My Team's Tasks" name="my_team_tasks" domain="[('task_id.user_ids.employee_id.parent_id.user_id', '=', uid)]" />
@@ -52,7 +52,7 @@
             <field name="model">report.project.task.user</field>
             <field name="inherit_id" ref="project.report_project_task_user_view_tree"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="after">
+                <field name="user_ids" position="after">
                     <field name="hours_effective" optional="hide" widget="float_time"/>
                     <field name="progress" optional="hide" widget="progressbar"/>
                 </field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 080e6fa66fb..bddd5bd47cc 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -11,7 +11,8 @@ class ReportProjectTaskUser(models.Model):
     _auto = False
 
     name = fields.Char(string='Task', readonly=True)
-    user_id = fields.Many2one('res.users', string='Assigned To', readonly=True)
+    user_ids = fields.Many2many('res.users', relation='project_task_user_rel', column1='task_id', column2='user_id',
+                                string='Assignees', readonly=True)
     create_date = fields.Datetime("Create Date", readonly=True)
     date_assign = fields.Datetime(string='Assignment Date', readonly=True)
     date_end = fields.Datetime(string='Ending Date', readonly=True)
@@ -55,7 +56,6 @@ class ReportProjectTaskUser(models.Model):
                     t.date_end as date_end,
                     t.date_last_stage_update as date_last_stage_update,
                     t.date_deadline as date_deadline,
-                    tu.user_id,
                     t.project_id,
                     t.priority,
                     t.name as name,
@@ -82,7 +82,6 @@ class ReportProjectTaskUser(models.Model):
                     t.date_end,
                     t.date_deadline,
                     t.date_last_stage_update,
-                    tu.user_id,
                     t.project_id,
                     t.priority,
                     t.name,
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index c44b0e9d95a..1f01e7f067c 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -17,7 +17,7 @@
             <field name="arch" type="xml">
                 <graph string="Tasks Analysis" sample="1">
                      <field name="project_id"/>
-                     <field name="user_id"/>
+                     <field name="user_ids"/>
                      <field name="nbr" invisible="1"/>
                  </graph>
              </field>
@@ -31,7 +31,7 @@
                     <field name="name"/>
                     <field name="partner_id" optional="hide"/>
                     <field name="project_id" optional="show"/>
-                    <field name="user_id" optional="show" widget="many2one_avatar_user"/>
+                    <field name="user_ids" optional="show" widget="many2many_avatar_user"/>
                     <field name="stage_id" optional="show"/>
                     <field name="company_id" optional="show" groups="base.group_multi_company"/>
                 </tree>
@@ -46,7 +46,7 @@
                     <field name="project_id"/>
                     <field name="name" />
                     <field name="stage_id"/>
-                    <field name="user_id"/>
+                    <field name="user_ids"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="name" string="Tags" filter_domain="[('task_id.tag_ids', 'ilike', self)]"/>
                     <field name="date_assign"/>
@@ -59,7 +59,7 @@
                     <filter string="Starred" name="starred" domain="[('task_id.priority', 'in', [0, 1])]"/>
                     <separator/>
                     <filter string="Tasks Late" name="late" domain="[('task_id.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"/>
-                    <filter string="Unassigned Tasks" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="Unassigned Tasks" name="unassigned" domain="[('user_ids', '=', False)]"/>
                     <filter string="Open tasks" name="open_tasks" domain="[('stage_id.fold', '=', False), ('stage_id.is_closed', '=', False)]"/>
                     <separator/>
                     <filter name="filter_date_deadline" date="date_deadline"/>
@@ -72,7 +72,7 @@
                     <group expand="1" string="Group By">
                         <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
                         <filter string="Stage" name="Stage" context="{'group_by': 'stage_id'}"/>
-                        <filter string="Assigned to" name="User" context="{'group_by': 'user_id'}"/>
+                        <filter string="Assigned to" name="User" context="{'group_by': 'user_ids'}"/>
                         <filter string="Customer" name="Customer" context="{'group_by': 'partner_id'}"/>
                         <filter string="Deadline" name="deadline" context="{'group_by': 'date_deadline'}"/>
                     </group>
diff --git a/addons/project/report/project_task_burndown_chart_report.py b/addons/project/report/project_task_burndown_chart_report.py
index ecc5ced3258..6850267e304 100644
--- a/addons/project/report/project_task_burndown_chart_report.py
+++ b/addons/project/report/project_task_burndown_chart_report.py
@@ -18,7 +18,8 @@ class ReportProjectTaskBurndownChart(models.Model):
     display_project_id = fields.Many2one('project.project', readonly=True)
     stage_id = fields.Many2one('project.task.type', readonly=True)
     date = fields.Datetime('Date', readonly=True)
-    user_id = fields.Many2one('res.users', string='Assigned to', readonly=True)
+    user_ids = fields.Many2many('res.users', relation='project_task_user_rel', column1='task_id', column2='user_id',
+                                string='Assignees', readonly=True)
     date_assign = fields.Datetime(string='Assignment Date', readonly=True)
     date_deadline = fields.Date(string='Deadline', readonly=True)
     partner_id = fields.Many2one('res.partner', string='Customer', readonly=True)
@@ -59,7 +60,6 @@ WITH all_moves_stage_task AS (
            COALESCE(LAG(mm.date) OVER (PARTITION BY mm.res_id ORDER BY mm.id), pt.create_date) as date_begin,
            mm.date as date_end,
            mtv.old_value_integer as stage_id,
-           usr_rel.user_id,
            pt.date_assign,
            pt.date_deadline,
            pt.partner_id
@@ -71,7 +71,6 @@ WITH all_moves_stage_task AS (
       JOIN ir_model_fields imf ON mtv.field = imf.id
                               AND imf.model = 'project.task'
                               AND imf.name = 'stage_id'
-      JOIN project_task_user_rel usr_rel ON pt.id=usr_rel.task_id
      WHERE pt.active
 
     --We compute the last reached stage
@@ -83,7 +82,6 @@ WITH all_moves_stage_task AS (
            COALESCE(md.date, pt.create_date) as date_begin,
            (CURRENT_DATE + interval '1 month')::date as date_end,
            pt.stage_id,
-           usr_rel.user_id,
            pt.date_assign,
            pt.date_deadline,
            pt.partner_id
@@ -99,7 +97,6 @@ WITH all_moves_stage_task AS (
                        AND mm.model = 'project.task'
                   ORDER BY mm.id DESC
                      FETCH FIRST ROW ONLY) md ON TRUE
-      JOIN project_task_user_rel usr_rel ON pt.id=usr_rel.task_id
      WHERE pt.active
 )
 SELECT (task_id*10^7 + 10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
@@ -108,7 +105,6 @@ SELECT (task_id*10^7 + 10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
        display_project_id,
        stage_id,
        d as date,
-       user_id,
        date_assign,
        date_deadline,
        partner_id,
@@ -125,7 +121,6 @@ SELECT (task_id*10^7 + 2*10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
        display_project_id,
        stage_id,
        date_trunc('week', d) as date,
-       user_id,
        date_assign,
        date_deadline,
        partner_id,
@@ -144,7 +139,6 @@ SELECT (task_id*10^7 + 3*10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
        display_project_id,
        stage_id,
        date_trunc('month', d) as date,
-       user_id,
        date_assign,
        date_deadline,
        partner_id,
@@ -163,7 +157,6 @@ SELECT (task_id*10^7 + 4*10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
        display_project_id,
        stage_id,
        date_trunc('quarter', d) as date,
-       user_id,
        date_assign,
        date_deadline,
        partner_id,
@@ -182,7 +175,6 @@ SELECT (task_id*10^7 + 5*10^6 + to_char(d, 'YYMMDD')::integer)::bigint as id,
        display_project_id,
        stage_id,
        date_trunc('year', d) as date,
-       user_id,
        date_assign,
        date_deadline,
        partner_id,
diff --git a/addons/project/report/project_task_burndown_chart_report_views.xml b/addons/project/report/project_task_burndown_chart_report_views.xml
index 74a519cc9b2..3cb97e0d8e8 100644
--- a/addons/project/report/project_task_burndown_chart_report_views.xml
+++ b/addons/project/report/project_task_burndown_chart_report_views.xml
@@ -7,12 +7,10 @@
         <field name="arch" type="xml">
             <search string="Burndown Chart">
                 <field name="project_id" />
-                <field name="user_id" />
                 <field name="date_assign"/>
                 <field name="date_deadline"/>
                 <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                 <field name="stage_id" />
-                <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                 <separator/>
                 <filter name="filter_date" date="date" string="Date" />
                 <filter name="filter_date_deadline" date="date_deadline"/>
@@ -23,7 +21,6 @@
                     <filter string="Date" name="date" context="{'group_by': 'date'}" />
                     <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}" />
                     <filter string="Project" name="project" context="{'group_by': 'project_id'}" />
-                    <filter string="Assigned To" name="user" context="{'group_by': 'user_id'}" />
                 </group>
             </search>
         </field>
diff --git a/addons/project/wizard/project_task_type_delete.py b/addons/project/wizard/project_task_type_delete.py
index 0fbf271f067..573473464c9 100644
--- a/addons/project/wizard/project_task_type_delete.py
+++ b/addons/project/wizard/project_task_type_delete.py
@@ -58,7 +58,7 @@ class ProjectTaskTypeDelete(models.TransientModel):
             action = self.env["ir.actions.actions"]._for_xml_id("project.action_view_task")
             action['domain'] = [('project_id', '=', project_id)]
             action['context'] = str({
-                'pivot_row_groupby': ['user_id'],
+                'pivot_row_groupby': ['user_ids'],
                 'default_project_id': project_id,
             })
         elif self.env.context.get('stage_view'):

From 49fce6207eb52352c6ba05418e2e04c9410481c5 Mon Sep 17 00:00:00 2001
From: "Laurent Stukkens (LTU)" <ltu@odoo.com>
Date: Tue, 14 Sep 2021 11:36:49 +0200
Subject: [PATCH 9/9] [FIX] project_mail_plugin: change user_id into user_ids

The `user_id` field was replaced in odoo/odoo#74087 by `user_ids`.
The field change was forgotten in in the returned action of the
`/mail_plugin/task/create` route.

task-2638359
closes #76166

X-original-commit: 7e7b6bec4d996a280475af5c691ec9db020fb048
---
 addons/project_mail_plugin/controllers/project_client.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_mail_plugin/controllers/project_client.py b/addons/project_mail_plugin/controllers/project_client.py
index 2fdbf445a16..0d0d1cb35c8 100644
--- a/addons/project_mail_plugin/controllers/project_client.py
+++ b/addons/project_mail_plugin/controllers/project_client.py
@@ -1,5 +1,5 @@
 
-from odoo import http, _
+from odoo import Command, http, _
 from odoo.http import request
 
 
@@ -39,7 +39,7 @@ class ProjectClient(http.Controller):
             'partner_id': partner_id,
             'description': email_body,
             'project_id': project_id,
-            'user_id': request.env.uid,
+            'user_ids': [Command.link(request.env.uid)],
         })
 
         return {'task_id': record.id, 'name': record.name}