multi company changes

addons_extensions/project_task_timesheet_extended/models/project_task.py

@@ -33,7 +33,7 @@ class projectTask(models.Model):
         ('normal', 'Normal'),
     ], compute='_compute_deadline_status')
 
-    model_id = fields.Many2one('project.module.source')
+    model_id = fields.Many2one('project.module.source', string="Module")
 
     @api.depends('date_deadline')
     def _compute_deadline_status(self):

addons_extensions/project_task_timesheet_extended/models/user_timeline_entry.py

@@ -11,6 +11,7 @@ class UserTimelineEntry(models.Model):
                 CONCAT('timeline-', timeline.id::varchar) AS source_key,
                 CONCAT(COALESCE(task.sequence_name, task.name), ' - ', stage.name) AS name,
                 employee.id AS employee_id,
+                COALESCE(project.company_id, task.company_id, employee.company_id) AS company_id,
                 timeline.assigned_to AS user_id,
                 task.project_id AS project_id,
                 task.id AS task_id,
@@ -53,6 +54,7 @@ class UserTimelineEntry(models.Model):
                 CONCAT('task-', task.id::varchar, '-', rel.user_id::varchar) AS source_key,
                 COALESCE(task.sequence_name, task.name) AS name,
                 employee.id AS employee_id,
+                COALESCE(project.company_id, task.company_id, employee.company_id) AS company_id,
                 rel.user_id AS user_id,
                 task.project_id AS project_id,
                 task.id AS task_id,

addons_extensions/user_timelines/__manifest__.py

@@ -14,6 +14,7 @@
         "web",
     ],
     "data": [
+        "security/user_timeline_security.xml",
         "security/ir.model.access.csv",
         "views/user_timeline_views.xml",
         "views/hr_employee_views.xml",

addons_extensions/user_timelines/models/user_timeline_entry.py

@@ -25,6 +25,7 @@ class UserTimelineEntry(models.Model):
     _rec_name = "name"
 
     name = fields.Char(readonly=True)
+    company_id = fields.Many2one("res.company", readonly=True)
     employee_id = fields.Many2one("hr.employee", readonly=True)
     user_id = fields.Many2one("res.users", readonly=True)
     project_id = fields.Many2one("project.project", readonly=True)
@@ -66,6 +67,7 @@ class UserTimelineEntry(models.Model):
                 CONCAT('task-', task.id::varchar, '-', rel.user_id::varchar) AS source_key,
                 COALESCE(task.sequence_name, task.name) AS name,
                 employee.id AS employee_id,
+                COALESCE(project.company_id, task.company_id, employee.company_id) AS company_id,
                 rel.user_id AS user_id,
                 task.project_id AS project_id,
                 task.id AS task_id,
@@ -110,6 +112,7 @@ class UserTimelineEntry(models.Model):
                 CONCAT('leave-', leave.id::varchar) AS source_key,
                 CONCAT('Leave - ', leave_type.name) AS name,
                 leave.employee_id AS employee_id,
+                leave.company_id AS company_id,
                 employee.user_id AS user_id,
                 NULL::integer AS project_id,
                 NULL::integer AS task_id,
@@ -146,6 +149,7 @@ class UserTimelineEntry(models.Model):
                 CONCAT('public-holiday-', holiday.id::varchar, '-', employee.id::varchar) AS source_key,
                 CONCAT('Public Holiday - ', COALESCE(holiday.name, 'Company Holiday')) AS name,
                 employee.id AS employee_id,
+                COALESCE(holiday.company_id, employee.company_id) AS company_id,
                 employee.user_id AS user_id,
                 NULL::integer AS project_id,
                 NULL::integer AS task_id,
@@ -199,6 +203,7 @@ class UserTimelineEntry(models.Model):
                             entry_order.source_key
                     ) AS id,
                     entry_order.name,
+                    entry_order.company_id,
                     entry_order.employee_id,
                     entry_order.user_id,
                     entry_order.project_id,

addons_extensions/user_timelines/security/user_timeline_security.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="user_timeline_entry_company_rule" model="ir.rule">
+        <field name="name">User Timeline Entry Multi Company</field>
+        <field name="model_id" ref="model_user_timeline_entry"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+    </record>
+</odoo>

addons_extensions/user_timelines/views/user_timeline_views.xml

@@ -7,6 +7,7 @@
             <search string="Timelines">
                 <field name="name"/>
                 <field name="employee_id"/>
+                <field name="company_id"/>
                 <field name="user_id"/>
                 <field name="project_id"/>
                 <field name="task_id"/>
@@ -27,6 +28,7 @@
 
                 <group expand="0" string="Group By">
                     <filter name="group_employee" string="Employee" context="{'group_by': 'employee_id'}"/>
+                    <filter name="group_company" string="Company" context="{'group_by': 'company_id'}"/>
                     <filter name="group_user" string="User" context="{'group_by': 'user_id'}"/>
                     <filter name="group_project" string="Project" context="{'group_by': 'project_id'}"/>
                     <filter name="group_type" string="Type" context="{'group_by': 'entry_type'}"/>
@@ -42,6 +44,7 @@
             <list string="Timelines" create="false" edit="false" delete="false">
                 <field name="name"/>
                 <field name="employee_id"/>
+                <field name="company_id" optional="hide"/>
                 <field name="user_id" optional="hide"/>
                 <field name="entry_type"/>
                 <field name="project_id" optional="show"/>
@@ -67,6 +70,7 @@
                       create="false"
                       quick_create="false">
                 <field name="name"/>
+                <field name="company_id"/>
                 <field name="employee_id"/>
                 <field name="project_id"/>
                 <field name="leave_type_id"/>
@@ -107,6 +111,10 @@
                             <strong>Employee -</strong>
                             <t t-esc="employee_id[1]"/>
                         </div>
+                        <div t-if="company_id">
+                            <strong>Company -</strong>
+                            <t t-esc="company_id[1]"/>
+                        </div>
                         <div t-if="project_id">
                             <strong>Project -</strong>
                             <t t-esc="project_id[1]"/>
@@ -147,6 +155,7 @@
                     </div>
                 </templates>
                 <field name="name"/>
+                <field name="company_id"/>
                 <field name="employee_id"/>
                 <field name="project_id"/>
                 <field name="task_id"/>
@@ -164,6 +173,7 @@
         <field name="res_model">user.timeline.entry</field>
         <field name="view_mode">gantt,calendar,list</field>
         <field name="search_view_id" ref="view_user_timeline_entry_search"/>
+        <field name="domain">['|', ('company_id', '=', False), ('company_id', 'in', allowed_company_ids)]</field>
         <field name="context">{'search_default_group_employee': 1,'search_default_public_holidays_remove': 1,
             'default_is_public_holiday': 0}
         </field>