Add type project

models/account.py

@@ -9,19 +9,24 @@ class AccountAnalyticLine(models.Model):
     # ------------------------------------------------------
     # Fields declaration
     # ------------------------------------------------------
-    type_id = fields.Many2one(
+    task_type_id = fields.Many2one(
         comodel_name='project.type',
-        string='Type',
+        string='Type de tâche',
     )
+    project_type_id = fields.Many2one(
+        comodel_name='project.type',
+        string='Type de projet',
+        related='project_id.type_id',
+        store=True
+    )
+    department_id = fields.Many2one(related='employee_id.department_id')
+
+    @api.onchange('task_id')
+    def _onchange_task_id(self):
+        super(AccountAnalyticLine, self)._onchange_task_id()
+        if self.task_id:
+            self.task_type_id = self.task_id.type_id
 
-    @api.model
-    def _timesheet_preprocess(self, values):
-        values = super(AccountAnalyticLine, self)._timesheet_preprocess(values)
-        # task implies so line (at create)
-        if 'task_id' in values:
-            task = self.env['project.task'].sudo().browse(values['task_id'])
-            values['type_id'] = task.type_id.id
-        return values
     # ------------------------------------------------------
     # SQL Constraints
     # ------------------------------------------------------

report/group_report.py

@@ -8,12 +8,15 @@ class ReportProjectTaskUser(models.Model):
     _inherit = "report.project.task.user"
 
     manual_remaining_hours = fields.Float("Reste à faire", readonly=True)
+    task_type_id = fields.Many2one('project.type', string="Type de tâche", readonly=True)
 
     def _select(self):
         return super(ReportProjectTaskUser, self)._select() + """,
+            t.type_id as task_type_id, 
             manual_remaining_hours as manual_remaining_hours"""
 
     def _group_by(self):
         return super(ReportProjectTaskUser, self)._group_by() + """,
+            t.type_id,
             manual_remaining_hours
             """

report/project_report_view.xml

@@ -13,5 +13,16 @@
              </field>
         </record>
 
+        <record id="view_task_project_user_search" model="ir.ui.view">
+            <field name="name">report.project.task.user.search</field>
+            <field name="model">report.project.task.user</field>
+            <field name="inherit_id" ref="project.view_task_project_user_search"/>
+            <field name="arch" type="xml">
+                <filter name="project" position="after">
+                    <filter string="Type tâche" name="task_type" context="{'group_by':'task_type_id'}"/>
+                </filter>
+            </field>
+        </record>
+
     </data>
 </odoo>
\ No newline at end of file

views/hr_timesheet_views.xml

@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <field name="unit_amount" position="before">
-                    <field name="type_id"/>
+                    <field name="task_type_id"/>
 
                 </field>
             </field>
@@ -32,7 +32,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='employee_id']" position="after">
                     <field name="department_id" options='{"no_open": True}'/>
-                    <field name="type_id"/>
+                    <field name="project_type_id"/>
+                    <field name="task_type_id"/>
                 </xpath>
             </field>
         </record>
@@ -44,10 +45,13 @@
             <field name="arch" type="xml">
                 <field name="employee_id" position="after">
                     <field name="department_id"/>
-                    <field name="type_id"/>
+                    <field name="project_type_id"/>
+                    <field name="task_type_id"/>
                 </field>
                 <filter name="groupby_employee" position="after">
                     <filter string="Département" name="groupby_department" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Type Projet" name="groupby_project_type" domain="[]" context="{'group_by':'project_type_id'}"/>
+                    <filter string="Type Tâche" name="groupby_task_type" domain="[]" context="{'group_by':'task_type_id'}"/>
                 </filter>
             </field>
         </record>

views/project_task.xml

@@ -16,6 +16,20 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_task_form2_inherited_dig">
+            <field name="name">project.task.form.inherited</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='timesheet_ids']" position="attributes">
+                    <attribute name="context">{'default_project_id': project_id, 'default_task_type_id': type_id, 'default_name':''}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='timesheet_ids']//tree//field[@name='project_id']" position="before">
+                    <field name="task_type_id"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_task_tree2" model="ir.ui.view">
             <field name="name">project.task.inherit.tree</field>
             <field name="model">project.task</field>