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

[FIX] calendar: shows the event failing

Browse Source 
When importing many events (e.g. google synchronisation), it is not clear which
one is failing

opw-1855471
This commit is contained in:
Martin Trigaux
2018-06-06 10:21:23 +02:00
parent 087dd851a2
commit e7aff3775f
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/i18n/calendar.pot
+9 -2
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 11.0\n" "Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-07 10:30+0000\n" "POT-Creation-Date: 2018-06-06 08:01+0000\n"
"PO-Revision-Date: 2018-02-07 10:30+0000\n" "PO-Revision-Date: 2018-06-06 08:01+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -870,6 +870,13 @@ msgstr ""
msgid "Meeting" msgid "Meeting"
msgstr "" msgstr ""
#. module: calendar
#: code:addons/calendar/models/calendar.py:933
#: code:addons/calendar/models/calendar.py:937
#, python-format
msgid "Meeting '%s' starts '%s' and ends '%s'"
msgstr ""
#. module: calendar #. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Meeting Details" msgid "Meeting Details"
addons/calendar/models/calendar.py
+6 -2
View File
@@ -929,9 +929,13 @@ class Meeting(models.Model):
def _check_closing_date(self): def _check_closing_date(self):
for meeting in self: for meeting in self:
if meeting.start_datetime and meeting.stop_datetime and meeting.stop_datetime < meeting.start_datetime: if meeting.start_datetime and meeting.stop_datetime and meeting.stop_datetime < meeting.start_datetime:
raise ValidationError(_('Ending datetime cannot be set before starting datetime.')) raise ValidationError(_('Ending datetime cannot be set before starting datetime.') + "\n" +
_("Meeting '%s' starts '%s' and ends '%s'") % (meeting.name, meeting.start_datetime, meeting.stop_datetime)
)
if meeting.start_date and meeting.stop_date and meeting.stop_date < meeting.start_date: if meeting.start_date and meeting.stop_date and meeting.stop_date < meeting.start_date:
raise ValidationError(_('Ending date cannot be set before starting date.')) raise ValidationError(_('Ending date cannot be set before starting date.') + "\n" +
_("Meeting '%s' starts '%s' and ends '%s'") % (meeting.name, meeting.start_date, meeting.stop_date)
)
@api.onchange('start_datetime', 'duration') @api.onchange('start_datetime', 'duration')
def _onchange_duration(self): def _onchange_duration(self):