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

[FIX] resource: Make get_leave_days_data private

Browse Source
This commit is contained in:
Yannick Tivisse
2019-02-18 15:28:15 +00:00
parent 9cbc68b8ab
commit 624a1fc56b
3 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_allocation.py
+1 -1
View File
@@ -179,7 +179,7 @@ class HolidaysAllocation(models.Model):
period_start = creation_date
worked = holiday.employee_id._get_work_days_data(period_start, period_end, domain=[('holiday_id.holiday_status_id.unpaid', '=', True), ('time_type', '=', 'leave')])['days']
left = holiday.employee_id.get_leave_days_data(period_start, period_end, domain=[('holiday_id.holiday_status_id.unpaid', '=', True), ('time_type', '=', 'leave')])['days']
left = holiday.employee_id._get_leave_days_data(period_start, period_end, domain=[('holiday_id.holiday_status_id.unpaid', '=', True), ('time_type', '=', 'leave')])['days']
prorata = worked / (left + worked) if worked else 0
days_to_give = holiday.number_per_interval
addons/resource/models/resource_mixin.py
+1 -1
View File
@@ -122,7 +122,7 @@ class ResourceMixin(models.AbstractModel):
return self._get_days_data(intervals, day_total)
def get_leave_days_data(self, from_datetime, to_datetime, calendar=None, domain=None):
def _get_leave_days_data(self, from_datetime, to_datetime, calendar=None, domain=None):
"""
By default the resource calendar is used, but it can be
changed using the `calendar` argument.
addons/resource/tests/test_resource.py
+10 -10
View File
@@ -463,7 +463,7 @@ class TestResMixin(TestResourceCommon):
})
# Jean asks to see how much leave he has taken
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 9, 0, 0, 0, tzinfo=self.jean.tz),
datetime_tz(2018, 4, 13, 23, 59, 59, tzinfo=self.jean.tz),
)
@@ -473,14 +473,14 @@ class TestResMixin(TestResourceCommon):
# Patel Asks to see when Jean has taken some leaves
# Patel should see the same
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 9, 0, 0, 0, tzinfo=self.patel.tz),
datetime_tz(2018, 4, 13, 23, 59, 59, tzinfo=self.patel.tz),
)
self.assertEqual(data, {'days': 1, 'hours': 8})
# use Patel as a resource, jean's leaves are not visible
datas = self.patel.get_leave_days_data(
datas = self.patel._get_leave_days_data(
datetime_tz(2018, 4, 9, 0, 0, 0, tzinfo=self.patel.tz),
datetime_tz(2018, 4, 13, 23, 59, 59, tzinfo=self.patel.tz),
calendar=self.calendar_jean,
@@ -510,7 +510,7 @@ class TestResMixin(TestResourceCommon):
# John asks how much leaves he has
# He sees that he has only 15 hours of leave in his attendances
data = self.john.get_leave_days_data(
data = self.john._get_leave_days_data(
datetime_tz(2018, 4, 9, 0, 0, 0, tzinfo=self.john.tz),
datetime_tz(2018, 4, 13, 23, 59, 59, tzinfo=self.john.tz),
)
@@ -525,7 +525,7 @@ class TestResMixin(TestResourceCommon):
'date_to': datetime_str(2018, 4, 2, 14, 0, 0, tzinfo=self.jean.tz),
})
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 2, 0, 0, 0, tzinfo=self.jean.tz),
datetime_tz(2018, 4, 6, 23, 0, 0, tzinfo=self.jean.tz),
)
@@ -542,7 +542,7 @@ class TestResMixin(TestResourceCommon):
'date_to': datetime_str(2018, 4, 2, 10, 0, 0, tzinfo=self.jean.tz),
})
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 2, 0, 0, 0, tzinfo=self.jean.tz),
datetime_tz(2018, 4, 6, 23, 0, 0, tzinfo=self.jean.tz),
)
@@ -559,7 +559,7 @@ class TestResMixin(TestResourceCommon):
'date_to': datetime_str(2018, 4, 2, 10, 0, 1, tzinfo=self.jean.tz),
})
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 2, 0, 0, 0, tzinfo=self.jean.tz),
datetime_tz(2018, 4, 6, 23, 0, 0, tzinfo=self.jean.tz),
)
@@ -813,21 +813,21 @@ class TestTimezones(TestResourceCommon):
})
# 09-04-2018 10:00:00 - 13-04-2018 18:00:00
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 9, 8, 0, 0),
datetime_tz(2018, 4, 13, 16, 0, 0),
)
self.assertEqual(data, {'days': 0.5, 'hours': 4})
# 09-04-2018 00:00:00 - 13-04-2018 08:00:00
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 9, 8, 0, 0, tzinfo=self.tz3),
datetime_tz(2018, 4, 13, 16, 0, 0, tzinfo=self.tz3),
)
self.assertEqual(data, {'days': 0.75, 'hours': 6})
# 09-04-2018 08:00:00 - 14-04-2018 12:00:00
data = self.jean.get_leave_days_data(
data = self.jean._get_leave_days_data(
datetime_tz(2018, 4, 9, 8, 0, 0, tzinfo=self.tz2),
datetime_tz(2018, 4, 13, 16, 0, 0, tzinfo=self.tz4),
)