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

[MERGE] forward port branch saas-15 up to 2f6edfef49

Browse Source
This commit is contained in:
Christophe Simonis
2017-06-15 19:04:51 +02:00
parent 1b50c829ef 2f6edfef49
commit 2a008d5168
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/resource/tests/test_resource.py
-4
View File
@@ -281,7 +281,6 @@ class ResourceWorkingHours(TestResourceCommon):
res = self.calendar.plan_hours(-40, day_dt=Datetime.from_string('2013-02-12 09:00:00'))
self.assertEqual(res, Datetime.from_string('2013-01-29 09:00:00'))
def test_calendar_hours_scheduling_forward(self):
res = self.calendar._schedule_hours(40, day_dt=Datetime.from_string('2013-02-12 09:00:00'))
self.assertEqual(res[0][:2], (Datetime.from_string('2013-02-12 09:00:00'), Datetime.from_string('2013-02-12 16:00:00')))
@@ -292,9 +291,6 @@ class ResourceWorkingHours(TestResourceCommon):
self.assertEqual(res[5][:2], (Datetime.from_string('2013-02-22 16:00:00'), Datetime.from_string('2013-02-22 23:00:00')))
self.assertEqual(res[6][:2], (Datetime.from_string('2013-02-26 08:00:00'), Datetime.from_string('2013-02-26 09:00:00')))
res = self.calendar.schedule_hours_get_date(40, day_dt=self.date1.replace(minute=0, second=0))
self.assertEqual(res, Datetime.from_string('2013-02-26 09:00:00'))
td = timedelta()
for item in res:
td += item[1] - item[0]