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

2 files changed, 2 insertions, 4 deletions

diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index 0668cd57f68..84728623cd7 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -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:
diff --git a/addons/event/tests/test_event_flow.py b/addons/event/tests/test_event_flow.py
index 449d295674c..32a722efd85 100644
--- a/addons/event/tests/test_event_flow.py
+++ b/addons/event/tests/test_event_flow.py
@@ -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()