brian10048 · RLeeOSI · Jul 21, 2020 · Oct 9, 2020
diff --git a/fieldservice_skill/__manifest__.py b/fieldservice_skill/__manifest__.py
@@ -4,12 +4,12 @@
 {
     "name": "Field Service - Skills",
     "summary": "Manage your Field Service workers skills",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Field Service",
     "license": "AGPL-3",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
-    "depends": ["hr_skill", "fieldservice"],
+    "depends": ["hr_skills", "fieldservice"],
     "data": [
         "security/ir.model.access.csv",
         "views/fsm_person.xml",

diff --git a/fieldservice_skill/models/fsm_category.py b/fieldservice_skill/models/fsm_category.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/fieldservice_skill/models/fsm_order.py b/fieldservice_skill/models/fsm_order.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models

diff --git a/fieldservice_skill/models/fsm_person.py b/fieldservice_skill/models/fsm_person.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/fieldservice_skill/models/fsm_person_skill.py b/fieldservice_skill/models/fsm_person_skill.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/fieldservice_skill/models/fsm_template.py b/fieldservice_skill/models/fsm_template.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 - TODAY, Open Source Integrators
+# Copyright (C) 2018, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models

diff --git a/fieldservice_skill/readme/CONTRIBUTORS.rst b/fieldservice_skill/readme/CONTRIBUTORS.rst
@@ -1,4 +1,6 @@
 * Wolfgang Hall <whall@opensourceintegrators.com>
 * Maxime Chambreuil <mchambreuil@opensourceintegrators.com>
 * Steve Campbell <scampbell@opensourceintegrators.com>
+* Raphael Lee <rlee@opensourceintegrators.com>
 * Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+* Brian McMaster <brian@mcmpest.com>
diff --git a/fieldservice_skill/readme/INSTALL.rst b/fieldservice_skill/readme/INSTALL.rst
@@ -1,4 +1,4 @@
 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/12.0/base_geoengine
+https://github.com/OCA/geospatial/tree/13.0/base_geoengine
diff --git a/fieldservice_skill/views/fsm_order.xml b/fieldservice_skill/views/fsm_order.xml
@@ -7,11 +7,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_order_form" />
         <field name="arch" type="xml">
             <field name="category_ids" position="after">
-                <field
-                    name="skill_ids"
-                    widget="many2many_tags"
-                    options="{'color_field': 'color'}"
-                />
+                <field name="skill_ids" widget="many2many_tags" />
             </field>
         </field>
     </record>

diff --git a/fieldservice_skill/views/fsm_person_skill.xml b/fieldservice_skill/views/fsm_person_skill.xml
@@ -34,7 +34,6 @@
         <field name="name">Worker Skills</field>
         <field name="res_model">fsm.person.skill</field>
         <field name="view_id" ref="fsm_person_skill_tree" />
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
@@ -75,7 +74,6 @@
     <record id="action_fsm_person_skill_report" model="ir.actions.act_window">
         <field name="name">Worker Skills</field>
         <field name="res_model">fsm.person.skill</field>
-        <field name="view_type">form</field>
         <field name="view_mode">graph,pivot</field>
         <field name="help" type="html">
             <p>

diff --git a/fieldservice_skill/views/fsm_template.xml b/fieldservice_skill/views/fsm_template.xml
@@ -7,11 +7,7 @@
         <field name="inherit_id" ref="fieldservice.fsm_template_form_view" />
         <field name="arch" type="xml">
             <field name="category_ids" position="after">
-                <field
-                    name="skill_ids"
-                    widget="many2many_tags"
-                    options="{'color_field': 'color'}"
-                />
+                <field name="skill_ids" widget="many2many_tags" />
             </field>
         </field>
     </record>

diff --git a/fieldservice_skill/views/hr_skill.xml b/fieldservice_skill/views/hr_skill.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <record id="open_view_skill_form" model="ir.actions.act_window">
+        <field name="name">Skills</field>
+        <field name="res_model">hr.skill</field>
+        <field name="view_mode">tree,form</field>
+    </record>
     <menuitem
         id="menu_hr_skill"
         name="Skills"
-        action="hr_skill.open_view_skill_form"
+        action="open_view_skill_form"
         parent="fieldservice.menu_fsm_config_person"
         sequence="80"
     />