Skip to content

Commit 98872e7

Browse files
RaphaelRaphael
Raphael
authored and
Raphael
committed
[IMP] fieldservice_skill: black, isort, prettier
1 parent 72ad61e commit 98872e7

15 files changed

+96
-105
lines changed

‎fieldservice_skill/__manifest__.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,17 @@
99
"license": "AGPL-3",
1010
"author": "Open Source Integrators, Odoo Community Association (OCA)",
1111
"website": "https://github.com/OCA/field-service",
12-
"depends": [
13-
"hr_skill",
14-
"fieldservice",
15-
],
12+
"depends": ["hr_skill", "fieldservice",],
1613
"data": [
1714
"security/ir.model.access.csv",
1815
"views/fsm_person.xml",
1916
"views/fsm_category.xml",
2017
"views/fsm_person_skill.xml",
2118
"views/fsm_order.xml",
2219
"views/hr_skill.xml",
23-
"views/fsm_template.xml"
20+
"views/fsm_template.xml",
2421
],
2522
"development_status": "Beta",
26-
"maintainers": [
27-
"osi-scampbell",
28-
"max3903",
29-
],
30-
'installable': True,
23+
"maintainers": ["osi-scampbell", "max3903",],
24+
"installable": True,
3125
}

‎fieldservice_skill/models/__init__.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
# Copyright (C) 2018 - TODAY, Open Source Integrators
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33

4-
from . import (
5-
fsm_person_skill,
6-
fsm_person,
7-
fsm_category,
8-
fsm_order,
9-
fsm_template
10-
)
4+
from . import fsm_person_skill, fsm_person, fsm_category, fsm_order, fsm_template

‎fieldservice_skill/models/fsm_category.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66

77
class FSMCategory(models.Model):
8-
_inherit = 'fsm.category'
8+
_inherit = "fsm.category"
99

10-
skill_ids = fields.Many2many('hr.skill', string="Required Skills")
10+
skill_ids = fields.Many2many("hr.skill", string="Required Skills")

‎fieldservice_skill/models/fsm_order.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66

77
class FSMOrder(models.Model):
8-
_inherit = 'fsm.order'
8+
_inherit = "fsm.order"
99

10-
skill_ids = fields.Many2many('hr.skill', string="Required Skills")
10+
skill_ids = fields.Many2many("hr.skill", string="Required Skills")
1111

12-
@api.onchange('category_ids')
12+
@api.onchange("category_ids")
1313
def _onchange_category_ids(self):
1414
if not self.template_id:
1515
skill_ids = []
1616
for category in self.category_ids:
1717
skill_ids.extend([skill.id for skill in category.skill_ids])
1818
self.skill_ids = [(6, 0, skill_ids)]
1919

20-
@api.onchange('template_id')
20+
@api.onchange("template_id")
2121
def _onchange_template_id(self):
2222
if self.template_id:
2323
super(FSMOrder, self)._onchange_template_id()

‎fieldservice_skill/models/fsm_person.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class FSMPerson(models.Model):
8-
_inherit = 'fsm.person'
8+
_inherit = "fsm.person"
99

10-
skill_ids = fields.One2many('fsm.person.skill', 'person_id',
11-
string='Skills')
10+
skill_ids = fields.One2many("fsm.person.skill", "person_id", string="Skills")

‎fieldservice_skill/models/fsm_person_skill.py

+14-13
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@
55

66

77
class FSMPersonSkill(models.Model):
8-
_name = 'fsm.person.skill'
9-
_rec_name = 'skill_id'
10-
_description = 'Field Service Worker Skill'
8+
_name = "fsm.person.skill"
9+
_rec_name = "skill_id"
10+
_description = "Field Service Worker Skill"
1111

12-
LEVEL = [('0', 'Junior'),
13-
('1', 'Intermediate'),
14-
('2', 'Senior'),
15-
('3', 'Expert')]
12+
LEVEL = [("0", "Junior"), ("1", "Intermediate"), ("2", "Senior"), ("3", "Expert")]
1613

17-
person_id = fields.Many2one('fsm.person', string="Field Service Worker",
18-
required=True)
19-
skill_id = fields.Many2one('hr.skill', string="Skill", required=True)
20-
level = fields.Selection(LEVEL, string='Level', default=LEVEL[0][0])
14+
person_id = fields.Many2one(
15+
"fsm.person", string="Field Service Worker", required=True
16+
)
17+
skill_id = fields.Many2one("hr.skill", string="Skill", required=True)
18+
level = fields.Selection(LEVEL, string="Level", default=LEVEL[0][0])
2119

2220
_sql_constraints = [
23-
('person_skill_uniq', 'unique(person_id, skill_id)',
24-
"This person already has that skill!"),
21+
(
22+
"person_skill_uniq",
23+
"unique(person_id, skill_id)",
24+
"This person already has that skill!",
25+
),
2526
]

‎fieldservice_skill/models/fsm_template.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66

77
class FSMTemplate(models.Model):
8-
_inherit = 'fsm.template'
8+
_inherit = "fsm.template"
99

10-
skill_ids = fields.Many2many('hr.skill', string="Required Skills")
10+
skill_ids = fields.Many2many("hr.skill", string="Required Skills")

‎fieldservice_skill/views/fsm_category.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
33
<!-- Field Service Category Form Extended-->
44
<record id="fsm_category_form" model="ir.ui.view">
55
<field name="name">fsm.category.form</field>
66
<field name="model">fsm.category</field>
7-
<field name="inherit_id" ref="fieldservice.fsm_category_form_view"/>
7+
<field name="inherit_id" ref="fieldservice.fsm_category_form_view" />
88
<field name="arch" type="xml">
99
<xpath expr="//notebook" position="inside">
1010
<page string="Skills">
11-
<field name="skill_ids" nolabel="1"/>
11+
<field name="skill_ids" nolabel="1" />
1212
</page>
1313
</xpath>
1414
</field>
1515
</record>
16-
1716
</odoo>

‎fieldservice_skill/views/fsm_order.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
33
<!-- Field Service Order Form Extended-->
44
<record id="fsm_order_form" model="ir.ui.view">
55
<field name="name">fsm.order.form</field>
66
<field name="model">fsm.order</field>
7-
<field name="inherit_id" ref="fieldservice.fsm_order_form"/>
7+
<field name="inherit_id" ref="fieldservice.fsm_order_form" />
88
<field name="arch" type="xml">
99
<field name="category_ids" position="after">
10-
<field name="skill_ids"
11-
widget="many2many_tags"
12-
options="{'color_field': 'color'}"/>
10+
<field
11+
name="skill_ids"
12+
widget="many2many_tags"
13+
options="{'color_field': 'color'}"
14+
/>
1315
</field>
1416
</field>
1517
</record>
16-
1718
</odoo>

‎fieldservice_skill/views/fsm_person.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
33
<!-- Field Service Worker Form Extended-->
44
<record id="fsm_person_form" model="ir.ui.view">
55
<field name="name">fsm.person.form</field>
66
<field name="model">fsm.person</field>
7-
<field name="inherit_id" ref="fieldservice.fsm_person_form"/>
7+
<field name="inherit_id" ref="fieldservice.fsm_person_form" />
88
<field name="arch" type="xml">
99
<page name="contact" position="before">
1010
<page string="Skills">
1111
<field name="skill_ids" nolabel="1">
1212
<tree editable="bottom">
13-
<field name="skill_id" options="{'limit':1}"/>
14-
<field name="level" widget="priority"/>
13+
<field name="skill_id" options="{'limit':1}" />
14+
<field name="level" widget="priority" />
1515
</tree>
1616
</field>
1717
</page>
1818
</page>
1919
</field>
2020
</record>
21-
2221
<record id="fsm_person_search" model="ir.ui.view">
2322
<field name="name">fsm.person.search</field>
2423
<field name="model">fsm.person</field>
25-
<field name="inherit_id" ref="fieldservice.fsm_person_search_view"/>
24+
<field name="inherit_id" ref="fieldservice.fsm_person_search_view" />
2625
<field name="arch" type="xml">
2726
<field name="category_ids" position="after">
28-
<field name="skill_ids"/>
27+
<field name="skill_ids" />
2928
</field>
3029
</field>
3130
</record>

‎fieldservice_skill/views/fsm_person_skill.xml

+29-34
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
3-
43
<!-- Field Service Skill -->
54
<record id="fsm_person_skill_tree" model="ir.ui.view">
65
<field name="name">Skills</field>
76
<field name="model">fsm.person.skill</field>
87
<field name="arch" type="xml">
98
<tree string="Worker Skills">
10-
<field name="person_id"/>
11-
<field name="skill_id"/>
12-
<field name="level" widget="priority"/>
9+
<field name="person_id" />
10+
<field name="skill_id" />
11+
<field name="level" widget="priority" />
1312
</tree>
1413
</field>
1514
</record>
16-
1715
<record id="fsm_person_skill_form" model="ir.ui.view">
1816
<field name="name">fsm.person.skill.form</field>
1917
<field name="model">fsm.person.skill</field>
@@ -22,21 +20,20 @@
2220
<sheet>
2321
<group>
2422
<group>
25-
<field name="person_id"/>
26-
<field name="skill_id"/>
27-
<field name="level" widget="priority"/>
23+
<field name="person_id" />
24+
<field name="skill_id" />
25+
<field name="level" widget="priority" />
2826
</group>
29-
<group/>
27+
<group />
3028
</group>
3129
</sheet>
3230
</form>
3331
</field>
3432
</record>
35-
3633
<record id="action_fsm_person_skill" model="ir.actions.act_window">
3734
<field name="name">Worker Skills</field>
3835
<field name="res_model">fsm.person.skill</field>
39-
<field name="view_id" ref="fsm_person_skill_tree"/>
36+
<field name="view_id" ref="fsm_person_skill_tree" />
4037
<field name="view_type">form</field>
4138
<field name="view_mode">tree,form</field>
4239
<field name="help" type="html">
@@ -45,38 +42,36 @@
4542
</p>
4643
</field>
4744
</record>
48-
49-
<menuitem id="menu_fsm_person_skill"
50-
name="Worker Skills"
51-
action="action_fsm_person_skill"
52-
parent="fieldservice.data"
53-
sequence="80"/>
54-
45+
<menuitem
46+
id="menu_fsm_person_skill"
47+
name="Worker Skills"
48+
action="action_fsm_person_skill"
49+
parent="fieldservice.data"
50+
sequence="80"
51+
/>
5552
<!-- Reporting -->
5653
<record id="view_fsm_person_skill_graph" model="ir.ui.view">
5754
<field name="name">fsm.person.skill.graph</field>
5855
<field name="model">fsm.person.skill</field>
5956
<field name="arch" type="xml">
6057
<graph string="Worker Skills" type="bar">
61-
<field name="person_id" type="row"/>
62-
<field name="skill_id" type="row"/>
63-
<field name="level" type="row"/>
58+
<field name="person_id" type="row" />
59+
<field name="skill_id" type="row" />
60+
<field name="level" type="row" />
6461
</graph>
6562
</field>
6663
</record>
67-
6864
<record id="view_fsm_person_skill_pivot" model="ir.ui.view">
6965
<field name="name">fsm.person.skill.pivot</field>
7066
<field name="model">fsm.person.skill</field>
7167
<field name="arch" type="xml">
7268
<pivot string="Worker Skills" display_quantity="true">
73-
<field name="person_id" type="row"/>
74-
<field name="skill_id" type="row"/>
75-
<field name="level" type="row"/>
69+
<field name="person_id" type="row" />
70+
<field name="skill_id" type="row" />
71+
<field name="level" type="row" />
7672
</pivot>
7773
</field>
7874
</record>
79-
8075
<record id="action_fsm_person_skill_report" model="ir.actions.act_window">
8176
<field name="name">Worker Skills</field>
8277
<field name="res_model">fsm.person.skill</field>
@@ -88,11 +83,11 @@
8883
</p>
8984
</field>
9085
</record>
91-
92-
<menuitem id="menu_fsm_person_skill_reporting"
93-
name="Worker Skills"
94-
action="action_fsm_person_skill_report"
95-
parent="fieldservice.reporting"
96-
sequence="80"/>
97-
86+
<menuitem
87+
id="menu_fsm_person_skill_reporting"
88+
name="Worker Skills"
89+
action="action_fsm_person_skill_report"
90+
parent="fieldservice.reporting"
91+
sequence="80"
92+
/>
9893
</odoo>

‎fieldservice_skill/views/fsm_template.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
33
<!-- Field Service Order Form Extended-->
44
<record id="fsm_template_form" model="ir.ui.view">
55
<field name="name">fsm.template.form</field>
66
<field name="model">fsm.template</field>
7-
<field name="inherit_id" ref="fieldservice.fsm_template_form_view"/>
7+
<field name="inherit_id" ref="fieldservice.fsm_template_form_view" />
88
<field name="arch" type="xml">
99
<field name="category_ids" position="after">
10-
<field name="skill_ids"
11-
widget="many2many_tags"
12-
options="{'color_field': 'color'}"/>
10+
<field
11+
name="skill_ids"
12+
widget="many2many_tags"
13+
options="{'color_field': 'color'}"
14+
/>
1315
</field>
1416
</field>
1517
</record>
16-
1718
</odoo>

‎fieldservice_skill/views/hr_skill.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<odoo>
3-
4-
<menuitem id="menu_hr_skill"
5-
name="Skills"
6-
action="hr_skill.open_view_skill_form"
7-
parent="fieldservice.menu_fsm_config_person"
8-
sequence="80"/>
3+
<menuitem
4+
id="menu_hr_skill"
5+
name="Skills"
6+
action="hr_skill.open_view_skill_form"
7+
parent="fieldservice.menu_fsm_config_person"
8+
sequence="80"
9+
/>
910
</odoo>

‎setup/fieldservice_skill/odoo/addons/fieldservice_skill

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../fieldservice_skill

‎setup/fieldservice_skill/setup.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import setuptools
2+
3+
setuptools.setup(
4+
setup_requires=['setuptools-odoo'],
5+
odoo_addon=True,
6+
)

0 commit comments

Comments
 (0)