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

[FIX] hr_holidays: yet another date/datetime fix

Browse Source 
Still fixing some side effects of https://github.com/odoo-dev/odoo/commit/960360afe478a8f7b9c456721b5591154952a37d.
This commit is contained in:
Thibault Delavallée
2018-08-07 16:45:16 +02:00
parent 41eb02c218
commit 8edae4200f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/models/hr_leave.py
+6 -6
View File
@@ -158,13 +158,13 @@ class HolidaysRequest(models.Model):
if self.date_from:
date_from = fields.Datetime.to_string(datetime.combine(fields.Date.from_string(self.request_date_from), fields.Datetime.from_string(self.date_from).time()))
else:
date_from = self.request_date_from
date_from = datetime.combine(self.request_date_from, time.min)
if self.request_date_to:
if self.date_to:
date_to = fields.Datetime.to_string(datetime.combine(fields.Date.from_string(self.request_date_to), fields.Datetime.from_string(self.date_to).time()))
else:
date_to = self.request_date_to
date_to = datetime.combine(self.request_date_to, time.max)
if not self.request_date_from or not self.request_date_to:
if date_from:
@@ -247,8 +247,8 @@ class HolidaysRequest(models.Model):
date_to = date_from + timedelta(hours=self.employee_id.resource_calendar_id.hours_per_day)
self.date_to = date_to
self.request_date_from = date_from.date()
self.request_date_to = date_to.date()
self.request_date_from = date_from.date() if date_from else False
self.request_date_to = date_to.date() if date_to else False
if (date_from and date_to) and (date_from.day < date_to.day):
self.request_unit_all = 'period'
@@ -266,8 +266,8 @@ class HolidaysRequest(models.Model):
date_from = fields.Datetime.from_string(self.date_from)
date_to = fields.Datetime.from_string(self.date_to)
self.request_date_from = date_from.date()
self.request_date_to = date_to.date()
self.request_date_from = date_from.date() if date_from else False
self.request_date_to = date_to.date() if date_to else False
if (date_from and date_to) and (date_from.day < date_to.day):
self.request_unit_all = 'period'
addons/hr_holidays/models/hr_leave_allocation.py
+1 -1
View File
@@ -248,7 +248,7 @@ class HolidaysAllocation(models.Model):
@api.onchange('holiday_status_id')
def _onchange_holiday_status_id(self):
self.date_to = datetime.combine(self.holiday_status_id.validity_stop, datetime.max.time())
self.date_to = datetime.combine(self.holiday_status_id.validity_stop, time.max)
if self.accrual:
self.number_of_days_temp = 0