Skip to content

Commit

Permalink
[MIG] hr_employee_ppe: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
anusriNPS committed Nov 8, 2024
1 parent 3ccbce0 commit f8bca2b
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 37 deletions.
10 changes: 5 additions & 5 deletions hr_employee_ppe/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Personal Protective Equipment (PPE) Management
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github
:target: https://github.com/OCA/hr/tree/14.0/hr_employee_ppe
:target: https://github.com/OCA/hr/tree/16.0/hr_employee_ppe
:alt: OCA/hr
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_employee_ppe
:target: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_employee_ppe
: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/hr&target_branch=14.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand All @@ -49,7 +49,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr/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/hr/issues/new?body=module:%20hr_employee_ppe%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/hr/issues/new?body=module:%20hr_employee_ppe%0Aversion:%2016.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.

Expand Down Expand Up @@ -102,6 +102,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-marcelsavegnago| |maintainer-eduaparicio|

This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/14.0/hr_employee_ppe>`_ project on GitHub.
This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/16.0/hr_employee_ppe>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion hr_employee_ppe/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Personal Protective Equipment (PPE) Management",
"version": "14.0.1.0.1",
"version": "16.0.1.0.0",
"author": "Escodoo, Odoo Community Association (OCA)",
"maintainers": ["marcelsavegnago", "eduaparicio"],
"images": ["static/description/banner.png"],
Expand Down
3 changes: 2 additions & 1 deletion hr_employee_ppe/models/hr_personal_equipment.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ def _validate_allocation_vals(self):
return res

def validate_allocation(self):
super().validate_allocation()
res = super().validate_allocation()
self._check_dates()
return res

@api.model
def cron_ppe_expiry_verification(self, date_ref=None):
Expand Down
1 change: 0 additions & 1 deletion hr_employee_ppe/models/product_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class ProductTemplate(models.Model):

is_ppe = fields.Boolean(default=False)
indications = fields.Text(
string="Indications",
help="Situations in which the employee should use this equipment. Only for ppe",
)
expirable_ppe = fields.Boolean(
Expand Down
6 changes: 3 additions & 3 deletions hr_employee_ppe/reports/hr_employee_ppe_report_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
t-if="line.is_ppe"
>
<td>
<t t-esc="line.product_id.name" />
<t t-out="line.product_id.name" />
</td>
<td>
<t t-esc="line.quantity" />
<t t-out="line.quantity" />
</td>
<td>
<t t-esc="line.indications" />
<t t-out="line.indications" />
</td>
</tr>
</t>
Expand Down
18 changes: 10 additions & 8 deletions hr_employee_ppe/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?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>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* 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 }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Personal Protective Equipment (PPE) Management</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:f93350fdf3af6b48bd086a31abb6cd33bcf2b9b3ad1c793ea8fd8a8ac6a65251
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/14.0/hr_employee_ppe"><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-14-0/hr-14-0-hr_employee_ppe"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<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/16.0/hr_employee_ppe"><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-16-0/hr-16-0-hr_employee_ppe"><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=16.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 allocation of PPE to your employees.
A product can be marked as ppe and additional information as duration and indications can also be added.
If ppe products are selected in a equipment request, a button to print a receipt of PPE will appear.
Expand Down Expand Up @@ -397,7 +397,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr/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/hr/issues/new?body=module:%20hr_employee_ppe%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/hr/issues/new?body=module:%20hr_employee_ppe%0Aversion:%2016.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">
Expand Down Expand Up @@ -429,13 +429,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">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>
<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/marcelsavegnago"><img alt="marcelsavegnago" src="https://github.com/marcelsavegnago.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/eduaparicio"><img alt="eduaparicio" src="https://github.com/eduaparicio.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/14.0/hr_employee_ppe">OCA/hr</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/16.0/hr_employee_ppe">OCA/hr</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>
Expand Down
35 changes: 18 additions & 17 deletions hr_employee_ppe/tests/test_hr_employee_ppe.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@


class TestHREmployeePPE(TransactionCase):
def setUp(self):
super().setUp()
self.product_employee_ppe_expirable = self.env["product.template"].create(
def setUpClass(cls):
super().setUpClass()

cls.product_employee_ppe_expirable = cls.env["product.template"].create(
{
"name": "Product Test Employee PPE",
"is_personal_equipment": True,
Expand All @@ -23,7 +24,7 @@ def setUp(self):
"ppe_duration": 3,
}
)
self.product_employee_ppe_no_expirable = self.env["product.template"].create(
cls.product_employee_ppe_no_expirable = cls.env["product.template"].create(
{
"name": "Product Test Employee No PPE",
"is_personal_equipment": True,
Expand All @@ -32,26 +33,26 @@ def setUp(self):
"expirable_ppe": False,
}
)
self.user = (
self.env["res.users"]
cls.user = (
cls.env["res.users"]
.sudo()
.create(
{
"name": "Test User",
"login": "[email protected]",
"email": "[email protected]",
"groups_id": [
(4, self.env.ref("base.group_user").id),
(4, self.env.ref("hr.group_hr_user").id),
(4, cls.env.ref("base.group_user").id),
(4, cls.env.ref("hr.group_hr_user").id),
],
}
)
)
self.employee = self.env["hr.employee"].create(
{"name": "Employee Test", "user_id": self.user.id}
cls.employee = cls.env["hr.employee"].create(
{"name": "Employee Test", "user_id": cls.user.id}
)
product_exp = self.product_employee_ppe_expirable.product_variant_id
product_no_exp = self.product_employee_ppe_no_expirable.product_variant_id
product_exp = cls.product_employee_ppe_expirable.product_variant_id
product_no_exp = cls.product_employee_ppe_no_expirable.product_variant_id
lines = [
{
"name": "Personal Equipment PPE Expirable",
Expand All @@ -65,9 +66,9 @@ def setUp(self):
},
]

self.personal_equipment_request = (
self.env["hr.personal.equipment.request"]
.with_user(self.user.id)
cls.personal_equipment_request = (
cls.env["hr.personal.equipment.request"]
.with_user(cls.user.id)
.create(
{
"name": "Personal Equipment Request Test",
Expand All @@ -76,8 +77,8 @@ def setUp(self):
)
)

self.hr_employee_ppe_expirable = self.personal_equipment_request.line_ids[0]
self.hr_employee_ppe_no_expirable = self.personal_equipment_request.line_ids[1]
cls.hr_employee_ppe_expirable = cls.personal_equipment_request.line_ids[0]
cls.hr_employee_ppe_no_expirable = cls.personal_equipment_request.line_ids[1]

def test_compute_fields(self):
self.hr_employee_ppe_expirable._compute_fields()
Expand Down
6 changes: 5 additions & 1 deletion hr_employee_ppe/views/hr_personal_equipment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,26 @@
name="inherit_id"
ref="hr_employee_ppe.hr_personal_equipment_form_view"
/>
<field name="groups_id" eval="[(6,0,[ref('base.group_user')])]" />
<field name="arch" type="xml">
<field name="expire_ppe" position="attributes">
<attribute name="readonly">True</attribute>
<attribute name="groups">base.group_user</attribute>
</field>
<field name="expire_ppe" position="attributes">
<attribute name="readonly">True</attribute>
<attribute name="groups">base.group_user</attribute>
</field>
<field name="start_date" position="attributes">
<attribute name="readonly">True</attribute>
<attribute name="groups">base.group_user</attribute>
</field>
<field name="expiry_date" position="attributes">
<attribute name="readonly">True</attribute>
<attribute name="groups">base.group_user</attribute>
</field>
<field name="certification" position="attributes">
<attribute name="readonly">True</attribute>
<attribute name="groups">base.group_user</attribute>
</field>
</field>
</record>
Expand Down

0 comments on commit f8bca2b

Please sign in to comment.