Merge PR #1326 into 17.0

Signed-off-by brian10048

Author: OCA-git-bot

fieldservice/README.rst

@@ -32,14 +32,14 @@ This module is the base of the Field Service application in Odoo.
 
 Videos from OCA Days:
 
-- 2024: `Field Service
-  Management <https://www.youtube.com/watch?v=zBCa3e9rLHU>`__
-- 2022: `Field Service - New features and
-  roadmap <https://www.youtube.com/watch?v=MH8agrNE88A>`__
-- 2021: `Job and Service Management for Install and
-  Construction <https://www.youtube.com/watch?v=b7iivgfzPoo>`__
-- 2020: `Advanced Field Service
-  Management <https://www.youtube.com/watch?v=7bq3cwMFeME>`__
+-  2024: `Field Service
+   Management <https://www.youtube.com/watch?v=zBCa3e9rLHU>`__
+-  2022: `Field Service - New features and
+   roadmap <https://www.youtube.com/watch?v=MH8agrNE88A>`__
+-  2021: `Job and Service Management for Install and
+   Construction <https://www.youtube.com/watch?v=b7iivgfzPoo>`__
+-  2020: `Advanced Field Service
+   Management <https://www.youtube.com/watch?v=7bq3cwMFeME>`__
 
 **Table of contents**
 
@@ -213,31 +213,34 @@ Authors
 Contributors
 ------------
 
-- Wolfgang Hall <whall@opensourceintegrators.com>
-- Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
-- Steve Campbell <scampbell@opensourceintegrators.com>
-- Bhavesh Odedra <bodedra@opensourceintegrators.com>
-- Michael Allen <mallen@opensourceintegrators.com>
-- Sandip Mangukiya <smangukiya@opensourceintegrators.com>
-- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
-- Brian McMaster <brian@mcmpest.com>
-- Raphaël Reverdy <raphael.reverdy@akretion.com>
-- Ammar Officewala <ammar.o.serpentcs@gmail.com>
-- Yves Goldberg <yves@ygol.com>
-- Freni Patel <fpatel@opensourceintegrators.com>
-- `Tecnativa <https://www.tecnativa.com>`__:
-
-  - Víctor Martínez
-
-- Nils Coenen <nils.coenen@nico-solutions.de>
-- Alex Comba <alex.comba@agilebg.com>
+-  Wolfgang Hall <whall@opensourceintegrators.com>
+-  Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
+-  Steve Campbell <scampbell@opensourceintegrators.com>
+-  Bhavesh Odedra <bodedra@opensourceintegrators.com>
+-  Michael Allen <mallen@opensourceintegrators.com>
+-  Sandip Mangukiya <smangukiya@opensourceintegrators.com>
+-  Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+-  Brian McMaster <brian@mcmpest.com>
+-  Raphaël Reverdy <raphael.reverdy@akretion.com>
+-  Ammar Officewala <ammar.o.serpentcs@gmail.com>
+-  Yves Goldberg <yves@ygol.com>
+-  Freni Patel <fpatel@opensourceintegrators.com>
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Víctor Martínez
+
+-  Nils Coenen <nils.coenen@nico-solutions.de>
+-  Alex Comba <alex.comba@agilebg.com>
+-  `APSL-Nagarro <https://apsl.tech>`__:
+
+   -  Bernat Obrador <bobrador@apsl.net>
 
 Other credits
 -------------
 
 The development of this module has been financially supported by:
 
-- Open Source Integrators <https://opensourceintegrators.com>
+-  Open Source Integrators <https://opensourceintegrators.com>
 
 Maintainers
 -----------

fieldservice/readme/CONTRIBUTORS.md

@@ -14,3 +14,5 @@
   - Víctor Martínez
 - Nils Coenen \<<nils.coenen@nico-solutions.de>\>
 - Alex Comba \<<alex.comba@agilebg.com>\>
+- [APSL-Nagarro](<https://apsl.tech>):
+  - Bernat Obrador \<<bobrador@apsl.net>\>

fieldservice/static/description/index.html

@@ -597,6 +597,10 @@ <h2><a class="toc-backref" href="#toc-entry-19">Contributors</a></h2>
 </li>
 <li>Nils Coenen &lt;<a class="reference external" href="mailto:nils.coenen&#64;nico-solutions.de">nils.coenen&#64;nico-solutions.de</a>&gt;</li>
 <li>Alex Comba &lt;<a class="reference external" href="mailto:alex.comba&#64;agilebg.com">alex.comba&#64;agilebg.com</a>&gt;</li>
+<li><a class="reference external" href="https://apsl.tech">APSL-Nagarro</a>:<ul>
+<li>Bernat Obrador &lt;<a class="reference external" href="mailto:bobrador&#64;apsl.net">bobrador&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">

fieldservice/views/fsm_team.xml

@@ -203,7 +203,7 @@
                                         <a
                                             name="%(fieldservice.action_fsm_report_order)d"
                                             type="action"
-                                            context="{'search_default_team_id': id}"
+                                            context="{'search_default_team_id': active_id}"
                                         >
                                             Orders
                                         </a>

fieldservice_geoengine/views/fsm_team.xml

@@ -6,7 +6,7 @@
         <field name="name">Orders</field>
         <field name="res_model">fsm.order</field>
         <field name="view_mode">kanban,tree,geoengine,form,calendar</field>
-        <field name="context">{'default_team_id': id}</field>
-        <field name="domain">[('team_id', '=', id)]</field>
+        <field name="context">{'default_team_id': active_id}</field>
+        <field name="domain">[('team_id', '=', active_id)]</field>
     </record>
 </odoo>