Skip to content

[16.0][IMP] hr_employee_ppe: Using related fields #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anusriNPS wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

[16.0][IMP] hr_employee_ppe: Using related fields #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions hr_employee_ppe/models/hr_personal_equipment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ class HrPersonalEquipment(models.Model):
_name = "hr.personal.equipment"
_inherit = ["hr.personal.equipment"]

is_ppe = fields.Boolean()
is_ppe = fields.Boolean(related="product_id.is_ppe", store=True)
indications = fields.Text(
help="Situations in which the employee should use this equipment.",
related="product_id.indications",
store=True,
)
expire_ppe = fields.Boolean(
help="True if the PPE expires", related="product_id.expirable_ppe", store=True
)
expire_ppe = fields.Boolean(help="True if the PPE expires")
certification = fields.Char(
string="Certification Number", help="Certification Number"
)
Expand All @@ -29,16 +33,6 @@ def _accept_request_vals(self):
res["issued_by"] = self.env.user.id
return res

@api.onchange("product_id")
def _compute_fields(self):
for rec in self:
if rec.product_id.is_ppe:
rec.is_ppe = rec.product_id.is_ppe
if rec.product_id.expirable_ppe:
rec.expire_ppe = rec.product_id.expirable_ppe
if rec.product_id.indications:
rec.indications = rec.product_id.indications

def _validate_allocation_vals(self):
res = super()._validate_allocation_vals()
if self.start_date:
Expand Down
20 changes: 8 additions & 12 deletions hr_employee_ppe/tests/test_hr_employee_ppe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,6 @@ def setUpClass(cls):
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()
self.assertTrue(self.hr_employee_ppe_expirable.is_ppe)
self.assertTrue(self.hr_employee_ppe_expirable.expire_ppe)
self.assertEqual(
self.hr_employee_ppe_expirable.indications,
self.product_employee_ppe_expirable.indications,
)

def test_accept_allocation(self):
self.assertFalse(self.hr_employee_ppe_expirable.issued_by)
self.personal_equipment_request.with_user(self.user).accept_request()
Expand Down Expand Up @@ -139,10 +130,15 @@ def test_cron_ppe_expiry_verification_no_expirable_product(self):
self.assertNotEqual(self.hr_employee_ppe_no_expirable.state, "expired")

def test_check_dates(self):
self.hr_employee_ppe_expirable.start_date = "2020-01-01"
self.hr_employee_ppe_expirable.expiry_date = "2019-12-31"
self.assertTrue(self.hr_employee_ppe_expirable.is_ppe)
self.assertTrue(self.hr_employee_ppe_expirable.expire_ppe)
self.assertEqual(
self.hr_employee_ppe_expirable.indications,
self.product_employee_ppe_expirable.indications,
)
with self.assertRaises(ValidationError):
self.hr_employee_ppe_expirable.start_date = "2020-01-01"
self.hr_employee_ppe_expirable.expiry_date = "2019-12-31"
self.hr_employee_ppe_expirable._compute_fields()
self.hr_employee_ppe_expirable.validate_allocation()

def test_compute_contains_ppe(self):
Expand Down
Loading