diff --git a/helpdesk_mgmt_fieldservice/README.rst b/helpdesk_mgmt_fieldservice/README.rst
index 876e43003..bd76c462b 100644
--- a/helpdesk_mgmt_fieldservice/README.rst
+++ b/helpdesk_mgmt_fieldservice/README.rst
@@ -97,6 +97,7 @@ Contributors
 -  Open Source Integrators <contact@opensourceintegrators.com>
 -  Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
 -  Marcel Savegnago <marcel.savegnago@escodoo.com.br>
+-  Italo Lopes <italo.lopes@camptocamp.com>
 
 Maintainers
 -----------
diff --git a/helpdesk_mgmt_fieldservice/__manifest__.py b/helpdesk_mgmt_fieldservice/__manifest__.py
index 833e08257..eae202372 100644
--- a/helpdesk_mgmt_fieldservice/__manifest__.py
+++ b/helpdesk_mgmt_fieldservice/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Helpdesk Mgmt Fieldservice",
     "summary": """
         Create service orders from a ticket""",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "license": "AGPL-3",
     "author": "Open Source Integrators, "
     "Escodoo, "
diff --git a/helpdesk_mgmt_fieldservice/models/fsm_location.py b/helpdesk_mgmt_fieldservice/models/fsm_location.py
index 970fa48c3..f32a12d98 100644
--- a/helpdesk_mgmt_fieldservice/models/fsm_location.py
+++ b/helpdesk_mgmt_fieldservice/models/fsm_location.py
@@ -26,7 +26,7 @@ def action_view_ticket(self):
         action["context"] = {}
         if len(ticket_ids) == 1:
             action["views"] = [
-                (self.env.ref("helpdesk_mgmt.ticket_view_form").id, "form")
+                (self.env.ref("helpdesk_mgmt.helpdesk_ticket_view_form").id, "form")
             ]
             action["res_id"] = ticket_ids.ids[0]
         else:
diff --git a/helpdesk_mgmt_fieldservice/models/res_partner.py b/helpdesk_mgmt_fieldservice/models/res_partner.py
index 597a17a0c..c1d3f44c6 100644
--- a/helpdesk_mgmt_fieldservice/models/res_partner.py
+++ b/helpdesk_mgmt_fieldservice/models/res_partner.py
@@ -10,10 +10,10 @@ def action_view_helpdesk_tickets(self):
         ) and self.env.user.has_group("helpdesk_mgmt.group_helpdesk_user_own"):
             context = dict(self.env.context)
             context.pop("search_default_open", None)
-            self = self.with_context(
+            context_self = self.with_context(
                 context,
                 default_partner_id=self.id,
                 default_fsm_location_id=self.service_location_id.id,
             )
-            return super(ResPartner, self).action_view_helpdesk_tickets()
+            return super(ResPartner, context_self).action_view_helpdesk_tickets()
         return super().action_view_helpdesk_tickets
diff --git a/helpdesk_mgmt_fieldservice/readme/CONTRIBUTORS.md b/helpdesk_mgmt_fieldservice/readme/CONTRIBUTORS.md
index 5c436b08d..a809a153a 100644
--- a/helpdesk_mgmt_fieldservice/readme/CONTRIBUTORS.md
+++ b/helpdesk_mgmt_fieldservice/readme/CONTRIBUTORS.md
@@ -2,3 +2,4 @@
 - Open Source Integrators \<<contact@opensourceintegrators.com>\>
 - Serpent Consulting Services Pvt. Ltd. \<<support@serpentcs.com>\>
 - Marcel Savegnago \<<marcel.savegnago@escodoo.com.br>\>
+- Italo Lopes \<<italo.lopes@camptocamp.com>\>
diff --git a/helpdesk_mgmt_fieldservice/static/description/index.html b/helpdesk_mgmt_fieldservice/static/description/index.html
index 5653f532c..e23fdca4f 100644
--- a/helpdesk_mgmt_fieldservice/static/description/index.html
+++ b/helpdesk_mgmt_fieldservice/static/description/index.html
@@ -448,6 +448,7 @@ <h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
 <li>Open Source Integrators &lt;<a class="reference external" href="mailto:contact&#64;opensourceintegrators.com">contact&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Marcel Savegnago &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
+<li>Italo Lopes &lt;<a class="reference external" href="mailto:italo.lopes&#64;camptocamp.com">italo.lopes&#64;camptocamp.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/helpdesk_mgmt_fieldservice/views/helpdesk_ticket_views.xml b/helpdesk_mgmt_fieldservice/views/helpdesk_ticket_views.xml
index e46b3b757..aae8771db 100644
--- a/helpdesk_mgmt_fieldservice/views/helpdesk_ticket_views.xml
+++ b/helpdesk_mgmt_fieldservice/views/helpdesk_ticket_views.xml
@@ -8,46 +8,43 @@
     <record id="helpdesk_ticket_view_service_request_form" model="ir.ui.view">
         <field name="name">helpdesk.ticket.service.request.form</field>
         <field name="model">helpdesk.ticket</field>
-        <field name="inherit_id" ref="helpdesk_mgmt.ticket_view_form" />
+        <field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_form" />
         <field name="arch" type="xml">
             <page name="other_info" position="after">
-                    <page string="Service Orders">
-                        <button
+                <page string="Service Orders">
+                    <button
                         name="action_create_order"
                         string="Create FSM Order"
                         type="object"
                         class="btn btn-primary mb8"
                     />
-                        <field name="fsm_order_ids">
-                            <tree create="false">
-                                <field name="name" style="pointer-events:none;" />
-                                <field
-                                name="location_id"
-                                style="pointer-events:none;"
-                            />
-                                <field name="stage_id" style="pointer-events:none;" />
-                                <field name="person_id" style="pointer-events:none;" />
-                                <field
+                    <field name="fsm_order_ids">
+                        <tree create="false">
+                            <field name="name" style="pointer-events:none;" />
+                            <field name="location_id" style="pointer-events:none;" />
+                            <field name="stage_id" style="pointer-events:none;" />
+                            <field name="person_id" style="pointer-events:none;" />
+                            <field
                                 name="scheduled_date_start"
                                 style="pointer-events:none;"
                             />
-                                <field
+                            <field
                                 name="scheduled_date_end"
                                 style="pointer-events:none;"
                             />
-                                <field
+                            <field
                                 name="scheduled_duration"
                                 style="pointer-events:none;"
                             />
-                                <button
+                            <button
                                 name="action_view_order"
                                 string="Open"
                                 type="object"
                                 class="helpdesk_column"
                             />
-                            </tree>
-                        </field>
-                    </page>
+                        </tree>
+                    </field>
+                </page>
             </page>
             <field name="partner_id" position="before">
                 <field name="partner_domain" invisible="1" />
@@ -58,7 +55,8 @@
             <field name="partner_id" position="attributes">
                 <attribute
                     name="domain"
-                >['|', ('service_location_id', '=', partner_domain), (all_partners, '=', True)]</attribute>
+                >['|', ('service_location_id', '=', partner_domain), (all_partners, '=', True)]
+                </attribute>
             </field>
         </field>
     </record>
@@ -81,17 +79,14 @@
     <record id="helpdesk_ticket_view_form_logic" model="ir.ui.view">
         <field name="name">helpdesk.ticket.service.form.logic</field>
         <field name="model">helpdesk.ticket</field>
-        <field name="inherit_id" ref="helpdesk_mgmt.ticket_view_form" />
+        <field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_form" />
         <field name="priority">99</field>
         <field name="arch" type="xml">
             <field name="partner_name" position="attributes">
                 <attribute name="invisible">1</attribute>
             </field>
-            <field name="partner_email" position="replace">
-                <field
-                    name="partner_email"
-                    attrs="{'invisible': [('partner_id','=',False)]}"
-                />
+            <field name="partner_email" position="attributes">
+                <attribute name="invisible">not partner_id</attribute>
             </field>
             <field name="description" position="replace">
                 <group string="Description" name="description_grp">
@@ -107,7 +102,7 @@
     <record id="helpdesk_ticket_tree_view_location" model="ir.ui.view">
         <field name="name">helpdesk.ticket.tree.location</field>
         <field name="model">helpdesk.ticket</field>
-        <field name="inherit_id" ref="helpdesk_mgmt.ticket_view_tree" />
+        <field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_tree" />
         <field name="arch" type="xml">
             <field name="partner_name" position="after">
                 <field name="fsm_location_id" />