pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: add method to override selection of calendar

Browse Source 
closes odoo/odoo#33905

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
RomainLibert
2019-06-05 11:29:17 +00:00
parent c081ee0462
commit 4783253ba3
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/models/hr_leave.py
+5 -1
View File
@@ -384,11 +384,15 @@ class HolidaysRequest(models.Model):
for holiday in self:
holiday.number_of_days_display = holiday.number_of_days
def _get_calendar(self):
self.ensure_one()
return self.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id
@api.multi
@api.depends('number_of_days')
def _compute_number_of_hours_display(self):
for holiday in self:
calendar = holiday.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id
calendar = holiday._get_calendar()
if holiday.date_from and holiday.date_to:
number_of_hours = calendar.get_work_hours_count(holiday.date_from, holiday.date_to)
holiday.number_of_hours_display = number_of_hours or (holiday.number_of_days * HOURS_PER_DAY)
addons/hr_payroll/models/hr_leave.py
+7 -11
View File
@@ -171,14 +171,10 @@ class HrLeave(models.Model):
return days
@api.multi
@api.depends('number_of_days')
def _compute_number_of_hours_display(self):
""" Override for the same reason as _get_number_of_days()"""
super(HrLeave, self)._compute_number_of_hours_display()
for holiday in self:
if holiday.date_from and holiday.date_to:
contracts = holiday.employee_id.sudo()._get_contracts(holiday.date_from, holiday.date_to, states=['incoming', 'open', 'pending'])
contract_calendar = contracts[:1].resource_calendar_id if contracts else None
calendar = contract_calendar or holiday.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id
holiday.number_of_hours_display = holiday.number_of_days * (calendar.hours_per_day or HOURS_PER_DAY)
def _get_calendar(self):
self.ensure_one()
if self.date_from and self.date_to:
contracts = self.employee_id.sudo()._get_contracts(self.date_from, self.date_to, states=['incoming', 'open', 'pending'])
contract_calendar = contracts[:1].resource_calendar_id if contracts else None
return contract_calendar or self.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id
return super()._get_calendar()