diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py index e54a96ff13f..6b061c6b79a 100644 --- a/addons/calendar/models/calendar.py +++ b/addons/calendar/models/calendar.py @@ -569,9 +569,9 @@ class Meeting(models.Model): @api.multi def _get_recurrent_date_by_event(self, date_field='start'): - """ Get recurrent dates based on Rule string and all event where recurrent_id is child - - date_field: the field containing the reference date information for recurrency computation + """ Get recurrent dates based on Rule string and all event where recurrent_id is child + + date_field: the field containing the reference date information for recurrence computation """ self.ensure_one() if date_field in self._fields and self._fields[date_field].type in ('date', 'datetime'): @@ -766,7 +766,7 @@ class Meeting(models.Model): ('weekly', 'Week(s)'), ('monthly', 'Month(s)'), ('yearly', 'Year(s)') - ], string='Recurrency', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval") + ], string='Recurrence', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval") recurrency = fields.Boolean('Recurrent', help="Recurrent Meeting") recurrent_id = fields.Integer('Recurrent ID') recurrent_id_date = fields.Datetime('Recurrent ID date') diff --git a/addons/calendar/tests/test_calendar_recurrent_event_case2.py b/addons/calendar/tests/test_calendar_recurrent_event_case2.py index 892c0ffe2aa..456a47fd9b9 100644 --- a/addons/calendar/tests/test_calendar_recurrent_event_case2.py +++ b/addons/calendar/tests/test_calendar_recurrent_event_case2.py @@ -13,8 +13,8 @@ class TestRecurrentEvent(common.TransactionCase): self.CalendarEvent = self.env['calendar.event'] def test_recurrent_meeting1(self): - # In order to test recurrent meetings in Odoo, I create meetings with different recurrency using different test cases. - # I create a recurrent meeting with daily recurrency and fixed amount of time. + # In order to test recurrent meetings in Odoo, I create meetings with different recurrence using different test cases. + # I create a recurrent meeting with daily recurrence and fixed amount of time. self.CalendarEvent.create({ 'count': 5, 'start': '2011-04-13 11:04:00', diff --git a/addons/lunch/models/lunch.py b/addons/lunch/models/lunch.py index e9c13060fc3..f539e6d8881 100644 --- a/addons/lunch/models/lunch.py +++ b/addons/lunch/models/lunch.py @@ -276,7 +276,7 @@ class LunchAlert(models.Model): alert_type = fields.Selection([('specific', 'Specific Day'), ('week', 'Every Week'), ('days', 'Every Day')], - string='Recurrency', required=True, index=True, default='specific') + string='Recurrence', required=True, index=True, default='specific') specific_day = fields.Date('Day', default=fields.Date.context_today) monday = fields.Boolean('Monday') tuesday = fields.Boolean('Tuesday') diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index 4fcc3b56c18..22069009380 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -333,7 +333,7 @@
Alerts are used to warn employee from possible issues concerning the lunch orders. - To create a lunch alert you have to define its recurrency, the time interval during which the alert should be executed and the message to display. + To create a lunch alert you have to define its recurrence, the time interval during which the alert should be executed and the message to display.
Example:
@@ -469,7 +469,7 @@
-
+