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

[IMP] calendar,lunch: change field names

Browse Source 
with this commit we changes field names for week days like su, mo, tu etc. to
sun, mon, tue and so on in calendar module, this is going to be used in
task 2317795 where we developed recurrency module for recurrency mixin.

Also with this commit we change field names of weekdays in lunch module to have
same name as we have in calendar and project module so that we can easily use
custom widget "web_weekly_recurrence" instead of defining boolean field in xml
for each day.

task-2335399

Co-authored-by: Mohammed Shekha <msh@odoo.com>
This commit is contained in:
YOGRAJ TANDEL
2021-03-26 12:25:44 +00:00
committed by Yannick Tivisse
co-authored by Mohammed Shekha
parent 3d0b77a711
commit 7fb9c81296
13 changed files with 149 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/tests/test_event_recurrence.py
+32 -32
View File
@@ -43,7 +43,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
""" Every week, on Tuesdays, for 3 occurences """
detached_events = self.event._apply_recurrence_values({
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'interval': 1,
'count': 3,
'event_tz': 'UTC',
@@ -63,7 +63,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 2,
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'count': 2,
'event_tz': 'UTC',
})
@@ -81,7 +81,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 2,
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'count': 2,
'event_tz': 'UTC',
})
@@ -96,7 +96,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
def test_weekly_until(self):
self.event._apply_recurrence_values({
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'interval': 2,
'end_type': 'end_date',
'until': datetime(2019, 11, 15),
@@ -156,7 +156,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
'interval': 2,
'month_by': 'day',
'byday': '3',
'weekday': 'TU',
'weekday': 'TUE',
'end_type': 'end_date',
'until': date(2020, 3, 15),
'event_tz': 'UTC',
@@ -176,7 +176,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
'interval': 2,
'rrule_type': 'monthly',
'month_by': 'day',
'weekday': 'WE',
'weekday': 'WED',
'byday': '-1',
'end_type': 'end_date',
'until': date(2020, 1, 15),
@@ -211,7 +211,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 2,
'rrule_type': 'weekly',
'mo': True,
'mon': True,
'count': '2',
'event_tz': 'US/Eastern', # DST change on 2002/10/27
})
@@ -232,7 +232,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 1,
'rrule_type': 'weekly',
'su': True,
'sun': True,
'count': '2',
'event_tz': 'US/Eastern' # DST change on 2002/4/7
})
@@ -254,7 +254,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 1,
'rrule_type': 'weekly',
'su': True,
'sun': True,
'count': '2',
'event_tz': 'US/Eastern' # DST change on 2002/4/7
})
@@ -276,7 +276,7 @@ class TestCreateRecurrentEvents(TestRecurrentEvents):
self.event._apply_recurrence_values({
'interval': 1,
'rrule_type': 'weekly',
'mo': True,
'mon': True,
'count': 2,
'event_tz': 'Europe/Brussels' # DST change on 2020/3/23
})
@@ -298,7 +298,7 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
'stop': datetime(2019, 10, 24, 18, 0),
'recurrency': True,
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'interval': 1,
'count': 3,
'event_tz': 'Etc/GMT-4',
@@ -322,8 +322,8 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
self.assertNotEqual(self.recurrence, new_recurrence)
self.assertEqual(new_recurrence.count, 2)
self.assertEqual(new_recurrence.dtstart, datetime(2019, 11, 2, 1, 0))
self.assertFalse(new_recurrence.tu)
self.assertTrue(new_recurrence.sa)
self.assertFalse(new_recurrence.tue)
self.assertTrue(new_recurrence.sat)
self.assertEventDates(new_recurrence.calendar_event_ids, [
(datetime(2019, 11, 2, 1, 0), datetime(2019, 11, 5, 18, 0)),
(datetime(2019, 11, 9, 1, 0), datetime(2019, 11, 12, 18, 0)),
@@ -340,8 +340,8 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
self.assertFalse(self.recurrence.exists())
self.assertEqual(new_recurrence.count, 3)
self.assertEqual(new_recurrence.dtstart, datetime(2019, 10, 26, 1, 0))
self.assertFalse(new_recurrence.tu)
self.assertTrue(new_recurrence.sa)
self.assertFalse(new_recurrence.tue)
self.assertTrue(new_recurrence.sat)
self.assertEventDates(new_recurrence.calendar_event_ids, [
(datetime(2019, 10, 26, 1, 0), datetime(2019, 10, 29, 18, 0)),
(datetime(2019, 11, 2, 1, 0), datetime(2019, 11, 5, 18, 0)),
@@ -374,8 +374,8 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
def test_change_week_day_rrule(self):
recurrence = self.events.recurrence_id
recurrence.rrule = 'FREQ=WEEKLY;COUNT=3;BYDAY=WE' # from TU to WE
self.assertFalse(self.recurrence.tu)
self.assertTrue(self.recurrence.we)
self.assertFalse(self.recurrence.tue)
self.assertTrue(self.recurrence.wed)
def test_shift_all_base_inactive(self):
self.recurrence.base_event_id.active = False
@@ -406,7 +406,7 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
event = self.events[1]
event.write({
'recurrence_update': 'future_events',
'fr': True, # recurrence is now Tuesday AND Friday
'fri': True, # recurrence is now Tuesday AND Friday
'count': 4,
})
self.assertEventDates(self.recurrence.calendar_event_ids, [
@@ -425,14 +425,14 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
self.assertEqual(events[2], self.events[2], "Events on Tuesdays should not have changed")
self.assertNotEqual(events.recurrence_id, self.recurrence, "Events should no longer be linked to the original recurrence")
self.assertEqual(events.recurrence_id.count, 4, "The new recurrence should have 4")
self.assertTrue(event.recurrence_id.tu)
self.assertTrue(event.recurrence_id.fr)
self.assertTrue(event.recurrence_id.tue)
self.assertTrue(event.recurrence_id.fri)
def test_update_recurrence_all(self):
with self.assertRaises(UserError):
self.events[1].write({
'recurrence_update': 'all_events',
'mo': True, # recurrence is now Tuesday AND Monday
'mon': True, # recurrence is now Tuesday AND Monday
})
def test_shift_single(self):
@@ -484,7 +484,7 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
'stop_date': datetime(2019, 10, 24),
'recurrency': True,
'rrule_type': 'weekly',
'tu': True,
'tue': True,
'interval': 1,
'count': 3,
'event_tz': 'Etc/GMT-4',
@@ -506,8 +506,8 @@ class TestUpdateRecurrentEvents(TestRecurrentEvents):
self.assertNotEqual(recurrence, new_recurrence)
self.assertEqual(new_recurrence.count, 2)
self.assertEqual(new_recurrence.dtstart, datetime(2019, 11, 2, 8, 0))
self.assertFalse(new_recurrence.tu)
self.assertTrue(new_recurrence.sa)
self.assertFalse(new_recurrence.tue)
self.assertTrue(new_recurrence.sat)
self.assertEventDates(new_recurrence.calendar_event_ids, [
(datetime(2019, 11, 2, 8, 0), datetime(2019, 11, 5, 18, 0)),
(datetime(2019, 11, 9, 8, 0), datetime(2019, 11, 12, 18, 0)),
@@ -527,8 +527,8 @@ class TestUpdateMultiDayWeeklyRecurrentEvents(TestRecurrentEvents):
'stop': datetime(2019, 10, 24, 18, 0),
'recurrency': True,
'rrule_type': 'weekly',
'tu': True,
'fr': True,
'tue': True,
'fri': True,
'interval': 1,
'count': 3,
'event_tz': 'Etc/GMT-4',
@@ -564,11 +564,11 @@ class TestUpdateMultiDayWeeklyRecurrentEvents(TestRecurrentEvents):
'start': event.start + relativedelta(days=3),
'stop': event.stop + relativedelta(days=3),
})
self.assertTrue(self.recurrence.fr)
self.assertTrue(self.recurrence.tu)
self.assertTrue(event.recurrence_id.tu)
self.assertTrue(event.recurrence_id.mo)
self.assertFalse(event.recurrence_id.fr)
self.assertTrue(self.recurrence.fri)
self.assertTrue(self.recurrence.tue)
self.assertTrue(event.recurrence_id.tue)
self.assertTrue(event.recurrence_id.mon)
self.assertFalse(event.recurrence_id.fri)
self.assertEqual(event.recurrence_id.count, 2)
@@ -586,7 +586,7 @@ class TestUpdateMonthlyByDay(TestRecurrentEvents):
'interval': 1,
'count': 3,
'month_by': 'day',
'weekday': 'TU',
'weekday': 'TUE',
'byday': '3',
'event_tz': 'Etc/GMT-4',
})