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

[FIX] event: test scenario, removing this month, which can be too vague for a short term date

Browse Source
This commit is contained in:
Fabien Pinckaers
2016-12-06 08:53:31 +01:00
parent ec2354a568
commit b048d1154f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/models/event.py
-2
View File
@@ -434,8 +434,6 @@ class EventRegistration(models.Model):
return _('in %d days') % (diff.days, )
elif (diff.days < 14):
return _('next week')
elif event_date.isocalendar()[1] == today.isocalendar()[1]:
return _('this month')
elif event_date.month == (today + relativedelta(months=+1)):
return _('next month')
else:
addons/event/tests/test_event_flow.py
+2 -2
View File
@@ -137,7 +137,7 @@ class TestEventFlow(TestEventCommon):
self.assertEqual(self.event_0.registration_ids.get_date_range_str(), u'in 2 days')
self.mock_datetime.now.return_value = Datetime.to_string(datetime.datetime(2015, 12, 10, 12, 0))
self.event_0.registration_ids.event_begin_date = datetime.datetime(2015, 12, 31, 6, 0)
self.assertEqual(self.event_0.registration_ids.get_date_range_str(), u'this month')
self.event_0.registration_ids.event_begin_date = datetime.datetime(2016, 1, 25, 6, 0)
self.assertEqual(self.event_0.registration_ids.get_date_range_str(), u'next month')
self.patcher.stop()