Merge PR #582 into 16.0

Signed-off-by pedrobaeza
OCA · Jun 5, 2024 · df4c4a9 · df4c4a9
2 parents ec6fb8a + 75ea23f
commit df4c4a9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/helpdesk_mgmt_timesheet/__manifest__.py b/helpdesk_mgmt_timesheet/__manifest__.py
@@ -25,6 +25,7 @@
         "views/helpdesk_team_view.xml",
         "views/helpdesk_ticket_view.xml",
         "views/hr_timesheet_view.xml",
+        "views/helpdesk_project_task_view.xml",
         "report/report_timesheet_templates.xml",
     ],
     "demo": ["demo/helpdesk_mgmt_timesheet_demo.xml"],

diff --git a/helpdesk_mgmt_timesheet/views/helpdesk_project_task_view.xml b/helpdesk_mgmt_timesheet/views/helpdesk_project_task_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<data>
+    <record id="view_task_form2_inherited" model="ir.ui.view">
+        <field name="name">project.task.form.ticket.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="//tree/field[@name='name']" position="after">
+                <field
+                    name="ticket_id"
+                    optional="hide"
+                    groups="helpdesk_mgmt.group_helpdesk_user"
+                />
+            </xpath>
+        </field>
+    </record>
+</data>
diff --git a/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml b/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml
@@ -145,7 +145,11 @@
                             <field name="task_id" invisible="1" />
                             <field name="date" widget="date" invisible="1" />
                             <field name="date_time" string="Date" required="1" />
-                            <field name="user_id" required="1" />
+                            <field
+                                name="user_id"
+                                required="1"
+                                widget="many2one_avatar_user"
+                            />
                             <field name="name" />
                             <field
                                 name="unit_amount"
@@ -199,7 +203,7 @@
                             </div>
                             <group>
                                 <field name="date" />
-                                <field name="user_id" />
+                                <field name="user_id" widget="many2one_avatar_user" />
                                 <field name="name" />
                                 <field
                                     name="unit_amount"