[FIX] hr_holidays: fix crash in mail_partner_format
We were trying to sort a list of date with potentially falsy elements in the list, causing a crash while trying to compare a date object with a bool. This commit just makes the check that all dates are not falsy before attempting to sort. closes odoo/odoo#77012 X-original-commit: 6bd2a86e37809b4d77aad4597e926e99f9d2b2ce Signed-off-by: Sébastien Theys (seb) <seb@odoo.com> Signed-off-by: Samuel Degueldre <sdegueldre@users.noreply.github.com>
This commit is contained in:
@@ -29,8 +29,8 @@ class ResPartner(models.Model):
|
||||
partners_format = super().mail_partner_format()
|
||||
for partner in self:
|
||||
# in the rare case of multi-user partner, return the earliest possible return date
|
||||
dates = sorted(partner.mapped('user_ids.leave_date_to'))
|
||||
date = dates[0] if dates and all(dates) else False
|
||||
dates = partner.mapped('user_ids.leave_date_to')
|
||||
date = sorted(dates)[0] if dates and all(dates) else False
|
||||
partners_format.get(partner).update({
|
||||
'out_of_office_date_end': date.strftime(DEFAULT_SERVER_DATE_FORMAT) if date else False,
|
||||
})
|
||||
|
||||
@@ -11,3 +11,4 @@ from . import test_change_department
|
||||
from . import test_leave_requests
|
||||
from . import test_out_of_office
|
||||
from . import test_company_leave
|
||||
from . import test_res_partner
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
|
||||
from datetime import date
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
from odoo import Command
|
||||
from odoo.tests.common import tagged, TransactionCase
|
||||
from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT
|
||||
|
||||
@tagged('post_install', '-at_install')
|
||||
class TestPartner(TransactionCase):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
# use a single value for today throughout the tests to avoid weird scenarios around midnight
|
||||
self.today = date.today()
|
||||
baseUser = self.env['res.users'].create({
|
||||
'email': 'e.e@example.com',
|
||||
'groups_id': [Command.link(self.env.ref('base.group_user').id)],
|
||||
'login': 'emp',
|
||||
'name': 'Ernest Employee',
|
||||
'notification_type': 'inbox',
|
||||
'signature': '--\nErnest',
|
||||
})
|
||||
self.partner = baseUser.partner_id
|
||||
self.users = baseUser + self.env['res.users'].create({
|
||||
'name': 'test1',
|
||||
'login': 'test1',
|
||||
'email': 'test1@example.com',
|
||||
'partner_id': self.partner.id,
|
||||
})
|
||||
self.employees = self.env['hr.employee'].create([{
|
||||
'user_id': user.id,
|
||||
} for user in self.users])
|
||||
self.leave_type = self.env['hr.leave.type'].create({
|
||||
'requires_allocation': 'no',
|
||||
'name': 'Legal Leaves',
|
||||
'time_type': 'leave',
|
||||
})
|
||||
self.leaves = self.env['hr.leave'].create([{
|
||||
'date_from': self.today + relativedelta(days=-2),
|
||||
'date_to': self.today + relativedelta(days=2),
|
||||
'employee_id': self.employees[0].id,
|
||||
'holiday_status_id': self.leave_type.id,
|
||||
}, {
|
||||
'date_from': self.today + relativedelta(days=-2),
|
||||
'date_to': self.today + relativedelta(days=3),
|
||||
'employee_id': self.employees[1].id,
|
||||
'holiday_status_id': self.leave_type.id,
|
||||
}])
|
||||
|
||||
def test_res_partner_mail_partner_format(self):
|
||||
self.assertEqual(
|
||||
self.partner.mail_partner_format()[self.partner]['out_of_office_date_end'],
|
||||
(self.today + relativedelta(days=2)).strftime(DEFAULT_SERVER_DATE_FORMAT),
|
||||
'Return date is the first return date of all users associated with a partner',
|
||||
)
|
||||
self.leaves[1].unlink()
|
||||
self.assertEqual(
|
||||
self.partner.mail_partner_format()[self.partner]['out_of_office_date_end'],
|
||||
False,
|
||||
'Partner is not considered out of office if one of their users is not on holiday',
|
||||
)
|
||||
Reference in New Issue
Block a user