[IMP] project,sale_project: adapting domains, fix edge cases, UI

Author: deneuvillem

addons/hr_timesheet/views/project_task_views.xml

@@ -124,11 +124,11 @@
                 <xpath expr="//field[@name='depend_on_ids']/list//field[@name='company_id']" position="after">
                     <field name="progress" column_invisible="True" groups="hr_timesheet.group_hr_timesheet_user"/>
                     <field name="allocated_hours" widget="timesheet_uom_no_toggle" sum="Total Allocated Time" optional="hide" groups="hr_timesheet.group_hr_timesheet_user"/>
-                    <field name="effective_hours" widget="timesheet_uom" sum="Effective Hours" optional="hide" groups="hr_timesheet.group_hr_timesheet_user"/>
-                    <field name="subtask_effective_hours" widget="timesheet_uom" optional="hide" groups="hr_timesheet.group_hr_timesheet_user"/>
-                    <field name="total_hours_spent" widget="timesheet_uom" optional="hide" groups="hr_timesheet.group_hr_timesheet_user"/>
-                    <field name="remaining_hours" widget="timesheet_uom" sum="Time Remaining" optional="hide" decoration-danger="progress &gt;= 1" decoration-warning="progress &gt;= 0.8 and progress &lt; 1" groups="hr_timesheet.group_hr_timesheet_user"/>
-                    <field name="progress" widget="project_task_progressbar" optional="hide" options="{'overflow_class': 'bg-danger'}" groups="hr_timesheet.group_hr_timesheet_user"/>
+                    <field name="effective_hours" widget="timesheet_uom" sum="Effective Hours" optional="hide" groups="hr_timesheet.group_hr_timesheet_user" column_invisible="context.get('default_is_template', False)"/>
+                    <field name="subtask_effective_hours" widget="timesheet_uom" optional="hide" groups="hr_timesheet.group_hr_timesheet_user" column_invisible="context.get('default_is_template', False)"/>
+                    <field name="total_hours_spent" widget="timesheet_uom" optional="hide" groups="hr_timesheet.group_hr_timesheet_user" column_invisible="context.get('default_is_template', False)"/>
+                    <field name="remaining_hours" widget="timesheet_uom" sum="Time Remaining" optional="hide" decoration-danger="progress &gt;= 1" decoration-warning="progress &gt;= 0.8 and progress &lt; 1" groups="hr_timesheet.group_hr_timesheet_user" column_invisible="context.get('default_is_template', False)"/>
+                    <field name="progress" widget="project_task_progressbar" optional="hide" options="{'overflow_class': 'bg-danger'}" groups="hr_timesheet.group_hr_timesheet_user" column_invisible="context.get('default_is_template', False)"/>
                 </xpath>
             </field>
         </record>

addons/project/models/project_project.py

@@ -114,7 +114,7 @@ def _set_favorite_user_ids(self, is_favorite):
     task_count = fields.Integer(compute='_compute_task_count', string="Task Count", export_string_translation=False)
     open_task_count = fields.Integer(compute='_compute_open_task_count', string="Open Task Count", export_string_translation=False)
     task_ids = fields.One2many('project.task', 'project_id', string='Tasks', export_string_translation=False,
-                               domain="[('is_closed', '=', False), ('is_template', '=', is_template)])")
+                               domain="[('is_closed', '=', False), ('is_template', 'in', [is_template, True])]")
     color = fields.Integer(string='Color Index', export_string_translation=False)
     user_id = fields.Many2one('res.users', string='Project Manager', default=lambda self: self.env.user, tracking=True, falsy_value_label=_lt("👤 Unassigned"))
     alias_id = fields.Many2one(help="Internal email associated with this project. Incoming emails are automatically synchronized "

addons/project/models/project_task.py

@@ -179,7 +179,7 @@ def _read_group_personal_stage_type_ids(self, stages, domain):
         help="Date on which the state of your task has last been modified.\n"
             "Based on this information you can identify tasks that are stalling and get statistics on the time it usually takes to move tasks from one stage/state to another.")
 
-    project_id = fields.Many2one('project.project', string='Project', domain="['|', ('company_id', '=', False), ('company_id', '=?',  company_id), ('is_template', '=', is_template)]",
+    project_id = fields.Many2one('project.project', string='Project', domain="['|', ('company_id', '=', False), ('company_id', '=?',  company_id), ('is_template', 'in', [is_template, False])]",
                                  compute="_compute_project_id", store=True, precompute=True, recursive=True, readonly=False, index=True, tracking=True, change_default=True, falsy_value_label=_lt("🔒 Private"))
     display_in_project = fields.Boolean(compute='_compute_display_in_project', store=True, export_string_translation=False)
     task_properties = fields.Properties('Properties', definition='project_id.task_properties_definition', copy=True)
@@ -230,8 +230,8 @@ def _read_group_personal_stage_type_ids(self, stages, domain):
     # In the domain of displayed_image_id, we couln't use attachment_ids because a one2many is represented as a list of commands so we used res_model & res_id
     displayed_image_id = fields.Many2one('ir.attachment', domain="[('res_model', '=', 'project.task'), ('res_id', '=', id), ('mimetype', 'ilike', 'image')]", string='Cover Image')
 
-    parent_id = fields.Many2one('project.task', string='Parent Task', inverse="_inverse_parent_id", index=True, domain="[('is_template', '=', is_template), '!', ('id', 'child_of', id)]", tracking=True)
-    child_ids = fields.One2many('project.task', 'parent_id', string="Sub-tasks", domain="[('recurring_task', '=', False), ('is_template', '=', is_template)]", export_string_translation=False)
+    parent_id = fields.Many2one('project.task', string='Parent Task', inverse="_inverse_parent_id", index=True, domain="['!', ('id', 'child_of', id)]", tracking=True)
+    child_ids = fields.One2many('project.task', 'parent_id', string="Sub-tasks", domain="[('recurring_task', '=', False)]", export_string_translation=False)
     subtask_count = fields.Integer("Sub-task Count", compute='_compute_subtask_count', export_string_translation=False)
     closed_subtask_count = fields.Integer("Closed Sub-tasks Count", compute='_compute_subtask_count', export_string_translation=False)
     project_privacy_visibility = fields.Selection(related='project_id.privacy_visibility', string="Project Visibility", tracking=False)
@@ -265,12 +265,12 @@ def _read_group_personal_stage_type_ids(self, stages, domain):
     # Tracking of this field is done in the write function
     depend_on_ids = fields.Many2many('project.task', relation="task_dependencies_rel", column1="task_id",
                                      column2="depends_on_id", string="Blocked By", tracking=True, copy=False,
-                                     domain="[('project_id', '!=', False), ('id', '!=', id), ('is_template', '=', is_template)]")
+                                     domain="[('project_id', '!=', False), ('id', '!=', id)]")
     depend_on_count = fields.Integer(string="Depending on Tasks", compute='_compute_depend_on_count', compute_sudo=True)
     closed_depend_on_count = fields.Integer(string="Closed Depending on Tasks", compute='_compute_depend_on_count', compute_sudo=True)
     dependent_ids = fields.Many2many('project.task', relation="task_dependencies_rel", column1="depends_on_id",
                                      column2="task_id", string="Block", copy=False,
-                                     domain="[('project_id', '!=', False), ('id', '!=', id), ('is_template', '=', is_template)]", export_string_translation=False)
+                                     domain="[('project_id', '!=', False), ('id', '!=', id)]", export_string_translation=False)
     dependent_tasks_count = fields.Integer(string="Dependent Tasks", compute='_compute_dependent_tasks_count', export_string_translation=False)
 
     # Project sharing fields
@@ -306,6 +306,7 @@ def _read_group_personal_stage_type_ids(self, stages, domain):
     )
     link_preview_name = fields.Char(compute='_compute_link_preview_name', export_string_translation=False)
     is_template = fields.Boolean(copy=False, export_string_translation=False)
+    has_project_template = fields.Boolean(related='project_id.is_template', string="Has Project Template", export_string_translation=False)
     has_template_ancestor = fields.Boolean(compute='_compute_has_template_ancestor', search='_search_has_template_ancestor',
                                            recursive=True, export_string_translation=False)
 
@@ -1285,7 +1286,7 @@ def write(self, vals):
 
         # rating on stage
         if 'stage_id' in vals and vals.get('stage_id'):
-            self.sudo().filtered(lambda x: x.project_id.rating_active and x.project_id.rating_status == 'stage' and not x.is_template)._send_task_rating_mail(force_send=True)
+            self.sudo().filtered(lambda x: x.project_id.rating_active and x.project_id.rating_status == 'stage')._send_task_rating_mail(force_send=True)
 
         if 'state' in vals:
             # specific use case: when the blocked task goes from 'forced' done state to a not closed state, we fix the state back to waiting
@@ -1920,8 +1921,6 @@ def action_convert_to_template(self):
                     'task_id': self.id,
                 },
             }
-        if not self.project_id.is_template:
-            raise UserError(self.env._("Tasks in a regular project cannot be converted into task templates."))
         self.is_template = True
         self.message_post(body=_("Task converted to template"))
         return {

addons/project/static/tests/tours/project_templates_tour.js

@@ -51,14 +51,22 @@ registry.category("web_tour.tours").add("project_templates_tour", {
             trigger: 'ul.dropdown-menu button.dropdown-item:contains("Project Template")',
             run: "click",
         },
+        {
+            trigger: '.modal div[name="name"] .o_input',
+            run: "edit New Project 2",
+        },
+        {
+            trigger: 'button[name="create_project_from_template"]',
+            run: "click",
+        },
         {
             content: "Go back to list view",
             trigger: ".breadcrumb-item a:contains('Projects')",
             run: "click",
         },
         {
             content: "Check for created project",
-            trigger: ".o_data_row td[name='name']:contains('Project Template')",
+            trigger: ".o_data_row td[name='name']:contains('New Project 2')",
         },
     ],
 });

addons/project/views/project_task_views.xml

@@ -408,7 +408,7 @@
                     <group>
                         <group>
                             <field name="project_id"
-                                domain="[('active', '=', True), '|', ('company_id', '=', False), ('company_id', '=?', company_id), ('is_template', '=', is_template)]"
+                                domain="[('active', '=', True), '|', ('company_id', '=', False), ('company_id', '=?', company_id), ('is_template', 'in', [is_template, False])]"
                                 required="parent_id or child_ids or is_template"
                                 widget="project"/>
                             <field name="milestone_id"
@@ -601,7 +601,7 @@
                                invisible="context.get('default_project_id', False)"
                                placeholder="Private"
                                class="o_project_task_project_field"
-                               domain="[('type_ids', 'in', context.get('default_stage_id')), ('is_template', '=', is_template)] if context.get('default_stage_id') else [('is_template', '=', is_template)]"
+                               domain="[('type_ids', 'in', context.get('default_stage_id')), ('is_template', 'in', [is_template, False])] if context.get('default_stage_id') else [('is_template', 'in', [is_template, False])]"
                                required="is_template"
                         />
                         <field name="user_ids" options="{'no_open': True, 'no_quick_create': True}"
@@ -625,7 +625,7 @@
                     <group>
                         <field name="project_id" invisible="1" />
                         <field name="company_id" invisible="1" />
-                        <field name="parent_id" domain="[('is_template', '=', is_template), ('id', '!=', id), '!', ('id', 'child_of', id)]" context="{'search_default_project_id': project_id, 'search_default_open_tasks': 1, 'default_is_template': is_template}"/>
+                        <field name="parent_id" domain="[('id', '!=', id), '!', ('id', 'child_of', id)]" context="{'search_default_project_id': project_id, 'search_default_open_tasks': 1, 'default_is_template': is_template}"/>
                     </group>
                     <footer>
                         <button string="Convert Task" class="btn-primary" special="save" data-hotkey="q"/>
@@ -657,6 +657,7 @@
                     <field name="allow_milestones" />
                     <field name="state" />
                     <field name="subtask_count"/>
+                    <field name="is_template"/>
                     <progressbar field="state" colors='{"1_done": "success-done", "1_canceled": "danger", "03_approved": "success", "02_changes_requested": "warning", "04_waiting_normal": "info", "01_in_progress": "200" }'/>
                     <templates>
                         <t t-name="menu" t-if="!selection_mode" groups="base.group_user">
@@ -1344,6 +1345,9 @@
                 <filter name="private_tasks" position="replace"/>
                 <filter name="closed_on" position="replace"/>
                 <filter name="customer" position="replace"/>
+                <filter name="unassigned" position="after">
+                    <filter name="task_templates" string="Task Templates" domain="[('has_project_template', '=', False)]" invisible="1"/>
+                </filter>
             </field>
         </record>
 
@@ -1352,7 +1356,7 @@
             <field name="res_model">project.task</field>
             <field name="view_mode">list,kanban,form</field>
             <field name="domain">[('is_template', '=', True)]</field>
-            <field name="context">{'default_is_template': True, 'hide_kanban_stages_nocontent': True}</field>
+            <field name="context">{'default_is_template': True, 'hide_kanban_stages_nocontent': True, 'search_default_task_templates': True}</field>
             <field name="search_view_id" ref="view_task_template_search_form"/>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">

addons/project/wizard/project_template_create_wizard.xml

@@ -6,13 +6,13 @@
         <field name="model">project.template.create.wizard</field>
         <field name="arch" type="xml">
             <form string="Project">
-                <div class="oe_title mb-lg-3 mb-md-2">
+                <div class="oe_title mb-2">
                     <label for="name" string="Name"/>
                     <h1>
                         <field name="name" class="o_project_name" placeholder="e.g. Office Party"/>
                     </h1>
                 </div>
-                <div class="mb-lg-3 mb-md-2">
+                <div class="mb-2">
                     <label for="date_start" string="Planned Date" class="pe-2"/>
                     <field name="date_start" widget="daterange" options='{"end_date_field": "date", "always_range": "1"}'/>
                 </div>

addons/sale_project/wizard/project_template_create_wizard.xml

@@ -8,8 +8,8 @@
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_title')]" position="after">
                 <field name="allow_billable" invisible="1"/>
-                <div name="partner_def" class="mb-lg-3 mb-md-2" invisible="not allow_billable">
-                    <label for="partner_id" string="Customer"/>
+                <div name="partner_def" class="mb-2" invisible="not allow_billable">
+                    <label for="partner_id" string="Customer" class="pe-2"/>
                     <span>
                         <field name="partner_id" placeholder="Select who to bill..." class="ms-1" widget="res_partner_many2one"
                             options="{'no_create_edit': True, 'no_open': True}"/>

addons/sale_timesheet/views/project_task_views.xml

@@ -159,7 +159,7 @@
                     <field name="sale_line_id" column_invisible="True"/>
                     <field name="remaining_hours_available" column_invisible="True"/>
                     <field name="remaining_hours_so" invisible="not sale_line_id or not remaining_hours_available" widget="timesheet_uom" optional="hide"
-                        groups="hr_timesheet.group_hr_timesheet_user" column_invisible="not (context.get('allow_billable', True) and context.get('allow_timesheets', True))"/>
+                        groups="hr_timesheet.group_hr_timesheet_user" column_invisible="not (context.get('allow_billable', True) and context.get('allow_timesheets', True)) or context.get('default_is_template', False)"/>
                 </xpath>
             </field>
         </record>