diff --git a/fieldservice_vehicle/README.rst b/fieldservice_vehicle/README.rst
new file mode 100644
index 0000000000..2dbfb5935b
--- /dev/null
+++ b/fieldservice_vehicle/README.rst
@@ -0,0 +1,137 @@
+======================
+Field Service Vehicles
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:cc8622bab0dca4e9ffa960ab600ed67f6ee01eaf51d83da5648a3dbb9a97ef5f
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github
+    :target: https://github.com/OCA/field-service/tree/17.0/fieldservice_vehicle
+    :alt: OCA/field-service
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_vehicle
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module allows you to manage your vehicles and assign them to a
+worker.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+To install Field Service and have the mapping features, you need to
+install GeoEngine.
+
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/13.0/base_geoengine
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+-  Go to Field Service > Master Data > Vehicles
+-  Create your vehicles and assign them to a worker
+
+Usage
+=====
+
+To use this module, you need to:
+
+-  Go to Field Service
+-  Create or select an order and assign it
+-  Follow the process
+
+Known issues / Roadmap
+======================
+
+The roadmap of the Field Service application is documented on
+`Github <https://github.com/OCA/field-service/issues/1>`__.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Open Source Integrators
+
+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>
+-  Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+-  Brian McMaster <brian@mcmpest.com>
+-  Vandan Pandeji <vpandeji@opensourceintegrators.com>
+-  `APSL <https://apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
+
+Other credits
+-------------
+
+The development of this module has been financially supported by:
+
+-  Open Source Integrators <https://opensourceintegrators.com>
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-wolfhall| image:: https://github.com/wolfhall.png?size=40px
+    :target: https://github.com/wolfhall
+    :alt: wolfhall
+.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px
+    :target: https://github.com/max3903
+    :alt: max3903
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-wolfhall| |maintainer-max3903| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/17.0/fieldservice_vehicle>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_vehicle/__init__.py b/fieldservice_vehicle/__init__.py
new file mode 100644
index 0000000000..8fc3b4add4
--- /dev/null
+++ b/fieldservice_vehicle/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2018, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/fieldservice_vehicle/__manifest__.py b/fieldservice_vehicle/__manifest__.py
new file mode 100644
index 0000000000..84646d2c1f
--- /dev/null
+++ b/fieldservice_vehicle/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Field Service Vehicles",
+    "summary": "Manage Field Service vehicles and assign drivers",
+    "version": "17.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": ["fieldservice"],
+    "data": [
+        "security/res_groups.xml",
+        "security/ir.model.access.csv",
+        "views/fsm_vehicle.xml",
+        "views/fsm_person.xml",
+        "views/fsm_order.xml",
+        "views/menu.xml",
+    ],
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["wolfhall", "max3903"],
+}
diff --git a/fieldservice_vehicle/i18n/de.po b/fieldservice_vehicle/i18n/de.po
new file mode 100644
index 0000000000..6e9d33860a
--- /dev/null
+++ b/fieldservice_vehicle/i18n/de.po
@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2022-12-04 15:44+0000\n"
+"Last-Translator: Nils Coenen | NICO SOLUTIONS - ENGINEERING & IT <nils."
+"coenen@nico-solutions.de>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.14.1\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Field-Service-Fahrzeuge hinzufügen."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Zugewiesener Fahrer"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Erstellt von"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Erstellt am"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Standard-Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Field Service Auftrag"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Service-Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Service-Fahrzeuge"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Field Service Mitarbeiter"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "Zuletzt geändert am"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert von"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Fahrzeuge verwalten"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Fahrzeug"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "Es existiert bereits ein Fahrzeug mit diesem Namen!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Fahrzeuge"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Fahrzeug-Bericht"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Zugewiesenes Fahrzeug"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr ""
+#~ "Das Fahrzeug ist an diesem Tag bereits einer anderen Route zugewiesen!"
diff --git a/fieldservice_vehicle/i18n/es.po b/fieldservice_vehicle/i18n/es.po
new file mode 100644
index 0000000000..a219600db0
--- /dev/null
+++ b/fieldservice_vehicle/i18n/es.po
@@ -0,0 +1,127 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-07-20 11:09+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Agregue un veh??culo de servicio de campo aqu??."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conductor Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Veh??culo Predeterminado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Nombre Mostrado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Orden de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veh??culo de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veh??culos de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "??ltima Modificaci??n en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "actualizado por última vez por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "actualizado por última vez el"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestionar Vehículos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Veh??culo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "??El nombre del veh??culo ya existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Reporte de Veh??culos"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Veh??culo Asignado"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
diff --git a/fieldservice_vehicle/i18n/es_AR.po b/fieldservice_vehicle/i18n/es_AR.po
new file mode 100644
index 0000000000..b3d4c64726
--- /dev/null
+++ b/fieldservice_vehicle/i18n/es_AR.po
@@ -0,0 +1,124 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-10-04 01:34+0000\n"
+"Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
+"Language-Team: none\n"
+"Language: es_AR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Añada un Vehículo de Servicio de Campo acá."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conductor Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Vehículo Predeterminado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Mostrar Nombre"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Vehículo del Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Vehículos del Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "Última Modificación el"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "Última Actualización por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "Última Actualización en"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestionar Vehículos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Vehículo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "¡El nombre del Vehículo ya existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Vehículos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Reporte de Vehículos"
+
+#~ msgid "Order"
+#~ msgstr "Pedido"
diff --git a/fieldservice_vehicle/i18n/es_CL.po b/fieldservice_vehicle/i18n/es_CL.po
new file mode 100644
index 0000000000..2c5b7bd945
--- /dev/null
+++ b/fieldservice_vehicle/i18n/es_CL.po
@@ -0,0 +1,127 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-06-07 05:19+0000\n"
+"Last-Translator: Nelson Ram??rez S??nchez <info@konos.cl>\n"
+"Language-Team: none\n"
+"Language: es_CL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Agregue un veh??culo de servicio de campo aqu??."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conductor Asignado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Veh??culo Predeterminado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Nombre Mostrado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Pedido de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veh??culo de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veh??culos de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabajador de Servicio de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "??ltima Modificaci??n en"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "??ltima Actualizaci??n por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "??ltima Actualizaci??n el"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestionar Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Veh??culo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "??El nombre del veh??culo ya existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Veh??culos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Reporte de Veh??culos"
+
+#~ msgid "Assigned Vehicle"
+#~ msgstr "Veh??culo Asignado"
+
+#~ msgid "The vehicle is already assigned to another route on that day!"
+#~ msgstr "??El veh??culo ya est?? asignado a otra ruta ese d??a!"
diff --git a/fieldservice_vehicle/i18n/fieldservice_vehicle.pot b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
new file mode 100644
index 0000000000..9cc894173f
--- /dev/null
+++ b/fieldservice_vehicle/i18n/fieldservice_vehicle.pot
@@ -0,0 +1,118 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr ""
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr ""
diff --git a/fieldservice_vehicle/i18n/it.po b/fieldservice_vehicle/i18n/it.po
new file mode 100644
index 0000000000..c3489da2b8
--- /dev/null
+++ b/fieldservice_vehicle/i18n/it.po
@@ -0,0 +1,124 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-09-29 10:34+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Aggiungi un veicolo assistenza sul campo."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Conduttore assegnato"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Creato da"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Creato il"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Veicolo predefinito"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Nome visualizzato"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordine assistenza sul campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veicolo assistenza sul campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veicoli assistenza sul campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Lavoratore assistenza sul campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "Ultimo aggiornamento di"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "Ultimo aggiornamento il"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gestione veicoli"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Veicolo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "Il nome del veicolo esiste già!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Veicoli"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Report veicoli"
+
+#~ msgid "Order"
+#~ msgstr "Ordine"
diff --git a/fieldservice_vehicle/i18n/pt_BR.po b/fieldservice_vehicle/i18n/pt_BR.po
new file mode 100644
index 0000000000..695db49266
--- /dev/null
+++ b/fieldservice_vehicle/i18n/pt_BR.po
@@ -0,0 +1,121 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* fieldservice_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-12-08 22:39+0000\n"
+"Last-Translator: marcos-mendez <mendez.foto@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_vehicle
+msgid "Add a Field Service Vehicle here."
+msgstr "Adicione um Veículo de Serviço de Campo aqui."
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__person_id
+msgid "Assigned Driver"
+msgstr "Motorista Designado"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_uid
+msgid "Created by"
+msgstr "Criado por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_person__vehicle_id
+msgid "Default Vehicle"
+msgstr "Veículo Padrão"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__display_name
+msgid "Display Name"
+msgstr "Exibir Nome"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_order
+msgid "Field Service Order"
+msgstr "Ordem de Serviço de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_vehicle
+msgid "Field Service Vehicle"
+msgstr "Veículo de Serviço de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_vehicle
+msgid "Field Service Vehicles"
+msgstr "Veículos de Serviço de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model,name:fieldservice_vehicle.model_fsm_person
+msgid "Field Service Worker"
+msgstr "Trabalhador do Serviço de Campo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__id
+msgid "ID"
+msgstr "ID"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação Feita em"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualização Feita por"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__write_date
+msgid "Last Updated on"
+msgstr "Última Atualização Feita em"
+
+#. module: fieldservice_vehicle
+#: model:res.groups,name:fieldservice_vehicle.group_fsm_vehicle
+msgid "Manage Vehicles"
+msgstr "Gerenciar Veículos"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_vehicle__name
+msgid "Name"
+msgstr "Nome"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.fields,field_description:fieldservice_vehicle.field_fsm_order__vehicle_id
+msgid "Vehicle"
+msgstr "Veículo"
+
+#. module: fieldservice_vehicle
+#: model:ir.model.constraint,message:fieldservice_vehicle.constraint_fsm_vehicle_name_uniq
+msgid "Vehicle name already exists!"
+msgstr "O nome do veículo já existe!"
+
+#. module: fieldservice_vehicle
+#: model:ir.actions.act_window,name:fieldservice_vehicle.action_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_report_vehicle
+#: model:ir.ui.menu,name:fieldservice_vehicle.menu_fsm_vehicle
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_graph_view
+#: model_terms:ir.ui.view,arch_db:fieldservice_vehicle.fsm_vehicle_pivot_view
+msgid "Vehicles"
+msgstr "Veículos"
+
+#. module: fieldservice_vehicle
+#: model_terms:ir.actions.act_window,help:fieldservice_vehicle.action_fsm_report_vehicle
+msgid "Vehicles Report"
+msgstr "Relatório de Veículos"
diff --git a/fieldservice_vehicle/models/__init__.py b/fieldservice_vehicle/models/__init__.py
new file mode 100644
index 0000000000..910d4725c2
--- /dev/null
+++ b/fieldservice_vehicle/models/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import (
+    fsm_vehicle,
+    fsm_person,
+    fsm_order,
+)
diff --git a/fieldservice_vehicle/models/fsm_order.py b/fieldservice_vehicle/models/fsm_order.py
new file mode 100644
index 0000000000..1f70d25efd
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_order.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class FSMOrder(models.Model):
+    _inherit = "fsm.order"
+
+    @api.model
+    def _get_default_vehicle(self):
+        return self.person_id.vehicle_id.id or False
+
+    vehicle_id = fields.Many2one(
+        "fsm.vehicle", string="Vehicle", default=_get_default_vehicle
+    )
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if not vals.get("vehicle_id") and vals.get("person_id"):
+            self._onchange_person_id()
+        return res
+
+    @api.onchange("person_id")
+    def _onchange_person_id(self):
+        self.vehicle_id = (
+            self.person_id
+            and self.person_id.vehicle_id
+            and self.person_id.vehicle_id.id
+            or False
+        )
diff --git a/fieldservice_vehicle/models/fsm_person.py b/fieldservice_vehicle/models/fsm_person.py
new file mode 100644
index 0000000000..9ea293e3ef
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_person.py
@@ -0,0 +1,9 @@
+# Copyright (C) 2019 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class FSMPerson(models.Model):
+    _inherit = "fsm.person"
+
+    vehicle_id = fields.Many2one("fsm.vehicle", string="Default Vehicle")
diff --git a/fieldservice_vehicle/models/fsm_vehicle.py b/fieldservice_vehicle/models/fsm_vehicle.py
new file mode 100644
index 0000000000..f17274298b
--- /dev/null
+++ b/fieldservice_vehicle/models/fsm_vehicle.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2018 Brian McMaster
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class FSMVehicle(models.Model):
+    _name = "fsm.vehicle"
+    _description = "Field Service Vehicle"
+
+    name = fields.Char(required="True")
+    person_id = fields.Many2one("fsm.person", string="Assigned Driver")
+
+    _sql_constraints = [
+        ("name_uniq", "unique (name)", "Vehicle name already exists!"),
+    ]
diff --git a/fieldservice_vehicle/pyproject.toml b/fieldservice_vehicle/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/fieldservice_vehicle/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/fieldservice_vehicle/readme/CONFIGURE.md b/fieldservice_vehicle/readme/CONFIGURE.md
new file mode 100644
index 0000000000..f688ad88f4
--- /dev/null
+++ b/fieldservice_vehicle/readme/CONFIGURE.md
@@ -0,0 +1,4 @@
+To configure this module, you need to:
+
+- Go to Field Service \> Master Data \> Vehicles
+- Create your vehicles and assign them to a worker
diff --git a/fieldservice_vehicle/readme/CONTRIBUTORS.md b/fieldservice_vehicle/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..363b765f3e
--- /dev/null
+++ b/fieldservice_vehicle/readme/CONTRIBUTORS.md
@@ -0,0 +1,10 @@
+- 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>\>
+- Serpent Consulting Services Pvt. Ltd. \<<support@serpentcs.com>\>
+- Brian McMaster \<<brian@mcmpest.com>\>
+- Vandan Pandeji \<<vpandeji@opensourceintegrators.com>\>
+- [APSL](https://apsl.tech):
+  - Antoni Marroig  \<<amarroig@apsl.net>\>
diff --git a/fieldservice_vehicle/readme/CREDITS.md b/fieldservice_vehicle/readme/CREDITS.md
new file mode 100644
index 0000000000..7e4827b0a8
--- /dev/null
+++ b/fieldservice_vehicle/readme/CREDITS.md
@@ -0,0 +1,3 @@
+The development of this module has been financially supported by:
+
+- Open Source Integrators \<<https://opensourceintegrators.com>\>
diff --git a/fieldservice_vehicle/readme/DESCRIPTION.md b/fieldservice_vehicle/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..f20e72a486
--- /dev/null
+++ b/fieldservice_vehicle/readme/DESCRIPTION.md
@@ -0,0 +1,2 @@
+This module allows you to manage your vehicles and assign them to a
+worker.
diff --git a/fieldservice_vehicle/readme/INSTALL.md b/fieldservice_vehicle/readme/INSTALL.md
new file mode 100644
index 0000000000..263ff64d3a
--- /dev/null
+++ b/fieldservice_vehicle/readme/INSTALL.md
@@ -0,0 +1,5 @@
+To install Field Service and have the mapping features, you need to
+install GeoEngine.
+
+Please refer to the installation instructions available at:
+<https://github.com/OCA/geospatial/tree/13.0/base_geoengine>
diff --git a/fieldservice_vehicle/readme/ROADMAP.md b/fieldservice_vehicle/readme/ROADMAP.md
new file mode 100644
index 0000000000..e14dbdee6f
--- /dev/null
+++ b/fieldservice_vehicle/readme/ROADMAP.md
@@ -0,0 +1,2 @@
+The roadmap of the Field Service application is documented on
+[Github](https://github.com/OCA/field-service/issues/1).
diff --git a/fieldservice_vehicle/readme/USAGE.md b/fieldservice_vehicle/readme/USAGE.md
new file mode 100644
index 0000000000..92eeed27fa
--- /dev/null
+++ b/fieldservice_vehicle/readme/USAGE.md
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+- Go to Field Service
+- Create or select an order and assign it
+- Follow the process
diff --git a/fieldservice_vehicle/security/ir.model.access.csv b/fieldservice_vehicle/security/ir.model.access.csv
new file mode 100644
index 0000000000..c42f4b8c16
--- /dev/null
+++ b/fieldservice_vehicle/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_fsm_vehicle_fsm_user,fsm.vehicle.user,model_fsm_vehicle,fieldservice.group_fsm_user,1,0,0,0
+access_fsm_vehicle_fsm_manager,fsm.vehicle.manager,model_fsm_vehicle,fieldservice.group_fsm_manager,1,1,1,1
diff --git a/fieldservice_vehicle/security/res_groups.xml b/fieldservice_vehicle/security/res_groups.xml
new file mode 100644
index 0000000000..adad57bfc2
--- /dev/null
+++ b/fieldservice_vehicle/security/res_groups.xml
@@ -0,0 +1,13 @@
+<odoo>
+    <!-- FSM groups -->
+    <record id="group_fsm_vehicle" model="res.groups">
+        <field name="name">Manage Vehicles</field>
+        <field name="category_id" ref="base.module_category_hidden" />
+    </record>
+    <record id="fieldservice.group_fsm_user" model="res.groups">
+        <field
+            name="implied_ids"
+            eval="[(4, ref('fieldservice_vehicle.group_fsm_vehicle'))]"
+        />
+    </record>
+</odoo>
diff --git a/fieldservice_vehicle/static/description/icon.png b/fieldservice_vehicle/static/description/icon.png
new file mode 100644
index 0000000000..955674d8f0
Binary files /dev/null and b/fieldservice_vehicle/static/description/icon.png differ
diff --git a/fieldservice_vehicle/static/description/index.html b/fieldservice_vehicle/static/description/index.html
new file mode 100644
index 0000000000..5a579a8b51
--- /dev/null
+++ b/fieldservice_vehicle/static/description/index.html
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Field Service Vehicles</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="field-service-vehicles">
+<h1 class="title">Field Service Vehicles</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:cc8622bab0dca4e9ffa960ab600ed67f6ee01eaf51d83da5648a3dbb9a97ef5f
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_vehicle"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_vehicle"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to manage your vehicles and assign them to a
+worker.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-3">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-4">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="toc-entry-9">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-10">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
+<p>To install Field Service and have the mapping features, you need to
+install GeoEngine.</p>
+<p>Please refer to the installation instructions available at:
+<a class="reference external" href="https://github.com/OCA/geospatial/tree/13.0/base_geoengine">https://github.com/OCA/geospatial/tree/13.0/base_geoengine</a></p>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
+<p>To configure this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service &gt; Master Data &gt; Vehicles</li>
+<li>Create your vehicles and assign them to a worker</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Go to Field Service</li>
+<li>Create or select an order and assign it</li>
+<li>Follow the process</li>
+</ul>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-4">Known issues / Roadmap</a></h1>
+<p>The roadmap of the Field Service application is documented on
+<a class="reference external" href="https://github.com/OCA/field-service/issues/1">Github</a>.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/field-service/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_vehicle%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-6">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
+<ul class="simple">
+<li>Open Source Integrators</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
+<ul class="simple">
+<li>Wolfgang Hall &lt;<a class="reference external" href="mailto:whall&#64;opensourceintegrators.com">whall&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Maxime Chambreuil &lt;<a class="reference external" href="mailto:mchambreuil&#64;opensourceintegrators.com">mchambreuil&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Steve Campbell &lt;<a class="reference external" href="mailto:scampbell&#64;opensourceintegrators.com">scampbell&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
+<li>Michael Allen &lt;<a class="reference external" href="mailto:mallen&#64;opensourceintegrators.com">mallen&#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>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.com</a>&gt;</li>
+<li>Vandan Pandeji &lt;<a class="reference external" href="mailto:vpandeji&#64;opensourceintegrators.com">vpandeji&#64;opensourceintegrators.com</a>&gt;</li>
+<li><a class="reference external" href="https://apsl.tech">APSL</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#toc-entry-9">Other credits</a></h2>
+<p>The development of this module has been financially supported by:</p>
+<ul class="simple">
+<li>Open Source Integrators &lt;<a class="reference external" href="https://opensourceintegrators.com">https://opensourceintegrators.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_vehicle">OCA/field-service</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/fieldservice_vehicle/tests/__init__.py b/fieldservice_vehicle/tests/__init__.py
new file mode 100644
index 0000000000..4616b93d16
--- /dev/null
+++ b/fieldservice_vehicle/tests/__init__.py
@@ -0,0 +1,4 @@
+# Copyright (C) 2022 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_fsm_vehicle
diff --git a/fieldservice_vehicle/tests/test_fsm_vehicle.py b/fieldservice_vehicle/tests/test_fsm_vehicle.py
new file mode 100644
index 0000000000..0a9f1685d4
--- /dev/null
+++ b/fieldservice_vehicle/tests/test_fsm_vehicle.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2022 - TODAY, Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from datetime import datetime, timedelta
+
+from odoo.tests.common import TransactionCase
+
+
+class FSMVehicleCase(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.test_partner = self.env["res.partner"].create(
+            {"name": "Test Partner", "phone": "123", "email": "tp@email.com"}
+        )
+        self.test_vehicle = self.env["fsm.vehicle"].create({"name": "Test Vehicle"})
+
+        self.test_worker = self.env["fsm.person"].create(
+            {
+                "name": "Test Wokrer",
+                "email": "tw@email.com",
+                "vehicle_id": self.test_vehicle.id,
+            }
+        )
+        self.test_location = self.env["fsm.location"].create(
+            {
+                "name": "Test Location",
+                "phone": "123",
+                "email": "tp@email.com",
+                "partner_id": self.test_partner.id,
+                "owner_id": self.test_partner.id,
+            }
+        )
+
+    def test_vehicle(self):
+        self.test_order = self.env["fsm.order"].create(
+            {
+                "location_id": self.test_location.id,
+                "date_start": datetime.today(),
+                "date_end": datetime.today() + timedelta(hours=2),
+                "request_early": datetime.today(),
+                "person_id": self.test_worker.id,
+            }
+        )
+        self.test_order._onchange_person_id()
diff --git a/fieldservice_vehicle/views/fsm_order.xml b/fieldservice_vehicle/views/fsm_order.xml
new file mode 100644
index 0000000000..a89638169a
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_order.xml
@@ -0,0 +1,12 @@
+<odoo>
+    <record id="fsm_order_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.order.vehicle.form</field>
+        <field name="model">fsm.order</field>
+        <field name="inherit_id" ref="fieldservice.fsm_order_form" />
+        <field name="arch" type="xml">
+            <field name="person_id" position="after">
+                <field name="vehicle_id" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_vehicle/views/fsm_person.xml b/fieldservice_vehicle/views/fsm_person.xml
new file mode 100644
index 0000000000..1cc654f5e1
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_person.xml
@@ -0,0 +1,22 @@
+<odoo>
+    <record id="fsm_person_vehicle_tree_view" model="ir.ui.view">
+        <field name="name">fsm.person.vehicle.tree</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_tree" />
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="vehicle_id" />
+            </field>
+        </field>
+    </record>
+    <record id="fsm_person_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.person.vehicle.form</field>
+        <field name="model">fsm.person</field>
+        <field name="inherit_id" ref="fieldservice.fsm_person_form" />
+        <field name="arch" type="xml">
+            <field name="category_ids" position="before">
+                <field name="vehicle_id" />
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_vehicle/views/fsm_vehicle.xml b/fieldservice_vehicle/views/fsm_vehicle.xml
new file mode 100644
index 0000000000..e60743960e
--- /dev/null
+++ b/fieldservice_vehicle/views/fsm_vehicle.xml
@@ -0,0 +1,73 @@
+<odoo>
+    <!-- Field Service Vehicle -->
+    <record id="fsm_vehicle_tree_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.tree</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="person_id" />
+            </tree>
+        </field>
+    </record>
+    <record id="fsm_vehicle_form_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.form</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <label for="name" class="oe_edit_only" />
+                    <h1>
+                        <field name="name" />
+                    </h1>
+                    <group>
+                        <group>
+                            <field name="person_id" />
+                        </group>
+                        <group />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <!-- Field Service Vehicles -->
+    <record id="action_fsm_vehicle" model="ir.actions.act_window">
+        <field name="name">Field Service Vehicles</field>
+        <field name="res_model">fsm.vehicle</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Add a Field Service Vehicle here.
+            </p>
+        </field>
+    </record>
+    <!-- Reporting -->
+    <record id="fsm_vehicle_graph_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.graph</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <graph string="Vehicles" type="bar">
+                <field name="person_id" type="row" />
+            </graph>
+        </field>
+    </record>
+    <record id="fsm_vehicle_pivot_view" model="ir.ui.view">
+        <field name="name">fsm.vehicle.pivot</field>
+        <field name="model">fsm.vehicle</field>
+        <field name="arch" type="xml">
+            <pivot string="Vehicles" display_quantity="true">
+                <field name="person_id" type="row" />
+            </pivot>
+        </field>
+    </record>
+    <record id="action_fsm_report_vehicle" model="ir.actions.act_window">
+        <field name="name">Vehicles</field>
+        <field name="res_model">fsm.vehicle</field>
+        <field name="view_mode">graph,pivot</field>
+        <field name="help" type="html">
+            <p>
+                Vehicles Report
+            </p>
+        </field>
+    </record>
+</odoo>
diff --git a/fieldservice_vehicle/views/menu.xml b/fieldservice_vehicle/views/menu.xml
new file mode 100644
index 0000000000..079a7c6bca
--- /dev/null
+++ b/fieldservice_vehicle/views/menu.xml
@@ -0,0 +1,18 @@
+<odoo>
+    <menuitem
+        id="menu_fsm_vehicle"
+        name="Vehicles"
+        action="action_fsm_vehicle"
+        parent="fieldservice.data"
+        sequence="40"
+        groups="fieldservice_vehicle.group_fsm_vehicle"
+    />
+    <menuitem
+        id="menu_fsm_report_vehicle"
+        name="Vehicles"
+        action="action_fsm_report_vehicle"
+        parent="fieldservice.reporting"
+        sequence="50"
+        groups="fieldservice_vehicle.group_fsm_vehicle"
+    />
+</odoo>