Skip to content

Commit a7316c6

Browse files
[MIG] hr_personal_equipment_request: Migration to 18.0
1 parent 5f01690 commit a7316c6

10 files changed

+91
-75
lines changed

hr_personal_equipment_request/README.rst

+10-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Hr Personal Equipment Request
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github
20-
:target: https://github.com/OCA/hr/tree/17.0/hr_personal_equipment_request
20+
:target: https://github.com/OCA/hr/tree/18.0/hr_personal_equipment_request
2121
:alt: OCA/hr
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/hr-17-0/hr-17-0-hr_personal_equipment_request
23+
:target: https://translation.odoo-community.org/projects/hr-18-0/hr-18-0-hr_personal_equipment_request
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr&target_branch=17.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -72,7 +72,7 @@ Bug Tracker
7272
Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr/issues>`_.
7373
In case of trouble, please check there if your issue has already been reported.
7474
If you spotted it first, help us to smash it by providing a detailed and welcomed
75-
`feedback <https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_request%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
75+
`feedback <https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_request%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
7676

7777
Do not contact contributors directly about support or help with technical issues.
7878

@@ -87,10 +87,12 @@ Authors
8787
Contributors
8888
------------
8989

90-
- Alba Riera <[email protected]>
91-
- `APSL <https://apsl.tech>`__:
90+
- Alba Riera <[email protected]>
91+
- `APSL <https://apsl.tech>`__:
9292

93-
- Antoni Marroig <[email protected]>
93+
- Antoni Marroig <[email protected]>
94+
95+
- ``Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>``\ \_
9496

9597
Maintainers
9698
-----------
@@ -105,6 +107,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
105107
mission is to support the collaborative development of Odoo features and
106108
promote its widespread use.
107109

108-
This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/17.0/hr_personal_equipment_request>`_ project on GitHub.
110+
This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/18.0/hr_personal_equipment_request>`_ project on GitHub.
109111

110112
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

hr_personal_equipment_request/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"name": "Hr Personal Equipment Request",
66
"summary": """
77
This addon allows to manage employee personal equipment""",
8-
"version": "17.0.1.0.0",
8+
"version": "18.0.1.0.0",
99
"license": "AGPL-3",
1010
"author": "Creu Blanca, Odoo Community Association (OCA)",
1111
"website": "https://github.com/OCA/hr",
12-
"depends": ["product", "hr", "mail"],
12+
"depends": ["product", "hr", "mail", "purchase"],
1313
"data": [
1414
"security/hr_personal_equipment_request_security.xml",
1515
"security/ir.model.access.csv",

hr_personal_equipment_request/models/hr_employee.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def action_open_equipment_request(self):
3838
"name": _("Equipment Request"),
3939
"type": "ir.actions.act_window",
4040
"res_model": "hr.personal.equipment.request",
41-
"view_mode": "tree,form",
41+
"view_mode": "list,form",
4242
"context": {"group_by": "state"},
4343
"domain": [("id", "in", self.equipment_request_ids.ids)],
4444
}
@@ -50,6 +50,6 @@ def action_open_personal_equipment(self):
5050
"type": "ir.actions.act_window",
5151
"res_model": "hr.personal.equipment",
5252
"context": {"group_by": "state"},
53-
"view_mode": "tree,form",
53+
"view_mode": "list,form",
5454
"domain": [("id", "in", self.personal_equipment_ids.ids)],
5555
}

hr_personal_equipment_request/models/hr_personal_equipment_request.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ def action_open_personal_equipment(self):
6565
"name": _("Allocations"),
6666
"type": "ir.actions.act_window",
6767
"res_model": "hr.personal.equipment",
68-
"view_mode": "tree,form",
68+
"view_mode": "list,form",
6969
"domain": [("id", "in", self.line_ids.ids)],
7070
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
- Alba Riera \<<[email protected]>\>
22
- [APSL](https://apsl.tech):
3-
- Antoni Marroig \<<[email protected]>\>
3+
- Antoni Marroig \<<[email protected]>\>
4+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`_

hr_personal_equipment_request/static/description/index.html

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger ([email protected])
11-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Hr Personal Equipment Request</h1>
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369370
!! source digest: sha256:eba98fcbc7bf28db13085a8e800b36e14717a8137678a978ab424af2a340dbcd
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371-
<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/hr/tree/17.0/hr_personal_equipment_request"><img alt="OCA/hr" src="https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-17-0/hr-17-0-hr_personal_equipment_request"><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/hr&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372+
<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/hr/tree/18.0/hr_personal_equipment_request"><img alt="OCA/hr" src="https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-18-0/hr-18-0-hr_personal_equipment_request"><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/hr&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372373
<p>This module allows to create a personal equipment request and manage
373374
allocation of employee personal equipment.</p>
374375
<p><strong>Table of contents</strong></p>
@@ -414,7 +415,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
414415
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr/issues">GitHub Issues</a>.
415416
In case of trouble, please check there if your issue has already been reported.
416417
If you spotted it first, help us to smash it by providing a detailed and welcomed
417-
<a class="reference external" href="https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_request%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
418+
<a class="reference external" href="https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_request%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
418419
<p>Do not contact contributors directly about support or help with technical issues.</p>
419420
</div>
420421
<div class="section" id="credits">
@@ -433,16 +434,19 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
433434
<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
434435
</ul>
435436
</li>
437+
<li><tt class="docutils literal">Heliconia Solutions Pvt. Ltd. <span class="pre">&lt;https://www.heliconia.io&gt;</span></tt>_</li>
436438
</ul>
437439
</div>
438440
<div class="section" id="maintainers">
439441
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
440442
<p>This module is maintained by the OCA.</p>
441-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
443+
<a class="reference external image-reference" href="https://odoo-community.org">
444+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
445+
</a>
442446
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
443447
mission is to support the collaborative development of Odoo features and
444448
promote its widespread use.</p>
445-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/17.0/hr_personal_equipment_request">OCA/hr</a> project on GitHub.</p>
449+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/18.0/hr_personal_equipment_request">OCA/hr</a> project on GitHub.</p>
446450
<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>
447451
</div>
448452
</div>

hr_personal_equipment_request/tests/test_hr_personal_equipment_request.py

+33-25
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,42 @@ class TestHRPersonalEquipmentRequest(TransactionCase):
1010
def setUpClass(cls):
1111
super().setUpClass()
1212
cls.product_personal_equipment_1 = cls.env["product.template"].create(
13-
{
14-
"name": "Product Test Personal Equipment 1",
15-
"is_personal_equipment": True,
16-
"uom_id": cls.env.ref("uom.product_uom_unit").id,
17-
}
13+
[
14+
{
15+
"name": "Product Test Personal Equipment 1",
16+
"is_personal_equipment": True,
17+
"uom_id": cls.env.ref("uom.product_uom_unit").id,
18+
}
19+
]
1820
)
1921
cls.product_personal_equipment_2 = cls.env["product.template"].create(
20-
{
21-
"name": "Product Test Personal Equipment 2",
22-
"is_personal_equipment": True,
23-
"uom_id": cls.env.ref("uom.product_uom_unit").id,
24-
}
22+
[
23+
{
24+
"name": "Product Test Personal Equipment 2",
25+
"is_personal_equipment": True,
26+
"uom_id": cls.env.ref("uom.product_uom_unit").id,
27+
}
28+
]
2529
)
2630
cls.user = (
2731
cls.env["res.users"]
2832
.sudo()
2933
.create(
30-
{
31-
"name": "Test User",
32-
"login": "[email protected]",
33-
"email": "[email protected]",
34-
"groups_id": [
35-
(4, cls.env.ref("base.group_user").id),
36-
(4, cls.env.ref("hr.group_hr_user").id),
37-
],
38-
}
34+
[
35+
{
36+
"name": "Test User",
37+
"login": "[email protected]",
38+
"email": "[email protected]",
39+
"groups_id": [
40+
(4, cls.env.ref("base.group_user").id),
41+
(4, cls.env.ref("hr.group_hr_user").id),
42+
],
43+
}
44+
]
3945
)
4046
)
4147
cls.employee = cls.env["hr.employee"].create(
42-
{"name": "Employee Test", "user_id": cls.user.id}
48+
[{"name": "Employee Test", "user_id": cls.user.id}]
4349
)
4450

4551
lines = [
@@ -59,11 +65,13 @@ def setUpClass(cls):
5965
cls.env["hr.personal.equipment.request"]
6066
.with_user(cls.user.id)
6167
.create(
62-
{
63-
"name": "Personal Equipment Request Test",
64-
"employee_id": cls.employee.id,
65-
"line_ids": [(0, 0, line) for line in lines],
66-
}
68+
[
69+
{
70+
"name": "Personal Equipment Request Test",
71+
"employee_id": cls.employee.id,
72+
"line_ids": [(0, 0, line) for line in lines],
73+
}
74+
]
6775
)
6876
)
6977

hr_personal_equipment_request/views/hr_personal_equipment_request_views.xml

+9-13
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<page string="Personal Equipment">
5757
<field
5858
name="line_ids"
59-
mode="tree,form"
59+
mode="list,form"
6060
readonly="state != 'draft'"
6161
>
62-
<tree editable="bottom" name="equipment_lines">
62+
<list editable="bottom" name="equipment_lines">
6363
<field name="product_id" />
6464
<field name="quantity" />
6565
<field name="product_uom_id" />
@@ -70,7 +70,7 @@
7070
<field name="state" readonly="1" />
7171
<field name="equipment_request_id" invisible="1" />
7272
<field name="employee_id" invisible="1" />
73-
</tree>
73+
</list>
7474
<form>
7575
<header>
7676
<button
@@ -110,11 +110,7 @@
110110
</page>
111111
</notebook>
112112
</sheet>
113-
<div class="oe_chatter">
114-
<field name="message_follower_ids" widget="mail_followers" />
115-
<field name="activity_ids" widget="mail_activity" />
116-
<field name="message_ids" widget="mail_thread" />
117-
</div>
113+
<chatter />
118114
</form>
119115
</field>
120116
</record>
@@ -139,27 +135,27 @@
139135
</search>
140136
</field>
141137
</record>
142-
<record model="ir.ui.view" id="hr_personal_equipment_request_tree_view">
138+
<record model="ir.ui.view" id="hr_personal_equipment_request_list_view">
143139
<field
144140
name="name"
145-
>hr.personal.equipment.request.tree (in hr_personal_equipment_request)</field>
141+
>hr.personal.equipment.request.list (in hr_personal_equipment_request)</field>
146142
<field name="model">hr.personal.equipment.request</field>
147143
<field name="arch" type="xml">
148-
<tree
144+
<list
149145
decoration-success="state=='accepted'"
150146
decoration-muted="state=='cancelled'"
151147
>
152148
<field name="name" />
153149
<field name="employee_id" groups="hr.group_hr_user" />
154150
<field name="create_date" />
155151
<field name="state" />
156-
</tree>
152+
</list>
157153
</field>
158154
</record>
159155
<record model="ir.actions.act_window" id="hr_personal_equipment_request_act_window">
160156
<field name="name">Personal Equipment Request</field>
161157
<field name="res_model">hr.personal.equipment.request</field>
162-
<field name="view_mode">tree,form</field>
158+
<field name="view_mode">list,form</field>
163159
<field name="domain">[]</field>
164160
<field
165161
name="context"

hr_personal_equipment_request/views/hr_personal_equipment_views.xml

+6-10
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,17 @@
6363
/>
6464
</group>
6565
</sheet>
66-
<div class="oe_chatter">
67-
<field name="message_follower_ids" widget="mail_followers" />
68-
<field name="activity_ids" widget="mail_activity" />
69-
<field name="message_ids" widget="mail_thread" />
70-
</div>
66+
<chatter />
7167
</form>
7268
</field>
7369
</record>
74-
<record model="ir.ui.view" id="hr_personal_equipment_tree_view">
70+
<record model="ir.ui.view" id="hr_personal_equipment_list_view">
7571
<field
7672
name="name"
77-
>hr.personal.equipment.tree (in hr_personal_equipment_request)</field>
73+
>hr.personal.equipment.list (in hr_personal_equipment_request)</field>
7874
<field name="model">hr.personal.equipment</field>
7975
<field name="arch" type="xml">
80-
<tree
76+
<list
8177
create="0"
8278
decoration-info="state=='accepted'"
8379
decoration-success="state=='valid'"
@@ -92,7 +88,7 @@
9288
<field name="start_date" />
9389
<field name="state" />
9490
<field name="equipment_request_id" invisible="1" />
95-
</tree>
91+
</list>
9692
</field>
9793
</record>
9894
<record model="ir.ui.view" id="hr_personal_equipment_search_view">
@@ -149,7 +145,7 @@
149145
<record model="ir.actions.act_window" id="hr_personal_equipment_act_window">
150146
<field name="name">Allocations</field>
151147
<field name="res_model">hr.personal.equipment</field>
152-
<field name="view_mode">tree,form</field>
148+
<field name="view_mode">list,form</field>
153149
<field name="domain">[]</field>
154150
<field name="context">{'search_default_filter_valid_state':1}</field>
155151
</record>

hr_personal_equipment_request/views/product_template_views.xml

+15-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
<field name="model">product.template</field>
1010
<field name="inherit_id" ref="product.product_template_form_view" />
1111
<field name="arch" type="xml">
12-
<xpath expr="//field[@name='purchase_ok']/.." position="after">
13-
<div>
14-
<field name="is_personal_equipment" />
15-
<label for="is_personal_equipment" />
16-
</div>
17-
</xpath>
1812
<!-- This page serves as a hook if additional fields are needed> -->
1913
<xpath expr="//page[@name='inventory']" position="after">
2014
<page
@@ -25,4 +19,19 @@
2519
</xpath>
2620
</field>
2721
</record>
22+
<record model="ir.ui.view" id="view_product_supplier_inherit">
23+
<field
24+
name="name"
25+
>product.template.supplier.form (in hr_personal_equipment_request)</field>
26+
<field name="model">product.template</field>
27+
<field name="inherit_id" ref="purchase.view_product_supplier_inherit" />
28+
<field name="arch" type="xml">
29+
<xpath expr="//field[@name='purchase_ok']/.." position="after">
30+
<div>
31+
<field name="is_personal_equipment" />
32+
<label for="is_personal_equipment" />
33+
</div>
34+
</xpath>
35+
</field>
36+
</record>
2837
</odoo>

0 commit comments

Comments
 (0)