diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 27f4fcd4632..b845f1e9aa8 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -431,7 +431,7 @@ property or property parameter."), res_obj = attendee.ref if res_obj: att = {} - att_info = [] + att_info = [(image_cricle % color.get('needs-action')) + 'You', (image_cricle % color.get('accepted')) + res_obj.organizer+ '- Organizer
'] sub = res_obj.name other_invitation_ids = self.search(cr, uid, [('ref', '=', res_obj._name + ',' + str(res_obj.id))]) other_invitation_ids.remove(attendee.id) @@ -454,7 +454,6 @@ property or property parameter."), map_url = '' if res_obj.location: map_url = """ (View Map)""" % res_obj.location - org = [(image_cricle % color.get('needs-action')) + 'You', (image_cricle % color.get('accepted')) + res_obj.organizer] body_vals = {'user':attendee.user_id and attendee.user_id.name, 'name': res_obj.name, 'responsible': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', @@ -465,7 +464,7 @@ property or property parameter."), 'tz': tz, 'location': res_obj.location or '-', 'map' : map_url or '', - 'organizer':',\n' .join(org), + 'organizer' : res_obj.organizer, 'url' : footer} body_id = self.pool.get('email.template').search(cr, uid, [('subject', '=', 'Meeting Invitation')], context=context) body = self.pool.get('email.template').browse(cr, uid, body_id[0], context=context).body_html % body_vals diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml index 3305e684da7..1d43637a932 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/base_calendar/base_calendar_data.xml @@ -174,7 +174,7 @@
%(description)s
Attendees:
-
%(organizer)s - Organizer
%(attendees)s
+
%(attendees)s
Accept | Decline