diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index faa86f145ea..ae89d86d4f0 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -212,6 +212,19 @@ class crm_meeting(osv.Model): attendee_pool.write(cr, uid, attendee.id, {'state': 'accepted'}, context) return True + def get_day(self, cr, uid, ids, time= None, context=None): + rec = self.browse(cr, uid, ids,context=context)[0] + date = datetime.strptime(rec.date,'%Y-%m-%d %H:%M:%S') + if time == 'day': + res = str(date.day) + elif time == 'month': + res = date.strftime('%B') + " " + str(date.year) + elif time == 'dayname': + res = date.strftime('%A') + elif time == 'time': + res = date.strftime('%I:%M %p') + return res + class mail_message(osv.osv): _inherit = "mail.message" diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index 857398050d8..615c9e281e4 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -1,6 +1,6 @@ - + @@ -37,104 +37,94 @@ - - - ${object.name} - - - - - - - - - - - - - - - - - - -
-
${object.name}
-
-
Hello ${ctx['att_obj'].cn},
- ${object.organizer} invited you for the ${object.name} meeting of ${object.user_id.company_id.name}.
-
- - + + + + ${object.name} + + +
+
+ ${object.name} +
+
+ Hello ${ctx['att_obj'].cn} ,

${object.organizer} invited you for the ${object.name} meeting of ${object.user_id.company_id.name}.

+
+
+
+ - - - - - - - - - - - -
-
When : +
${object.get_day('dayname')}
+
+ ${object.get_day('day')}
+
${object.get_day('month')}
+
${object.get_day('time')}
 -
- ${object.event_time} -
-
-
Where : -
- 		-
- ${object.location or ''} - % if object.location : - - (View Map) - - % endif -
-
-
What : -
- 		-
- ${object.description or ''} -
-
-
Attendees:
- 		- % for attendee in object.attendee_ids: -
-
- - ${attendee.cn} - - % endfor + + + + + + + + + + + + + +
+
+ Where +
+ 		+
+ : ${object.location or ''} + % if object.location : + (View Map) + + % endif +
+
+
+ What +
+ 		+
+ : ${object.description or ''} +
+
+
+ Attendees +
+ 		+ :
+ You + + % for attendee in object.attendee_ids: + % if attendee.cn != ctx['att_obj'].cn: +
+ ${attendee.cn} + % endif + % endfor +
-
-
- - Accept - Decline - -
-
-
- --
Sent by ${object.user_id.name} from ${object.user_id.company_id.name}. View this meeting detail - directly in OpenERP. -
-
- - - ]]> + +
+ Accept + Decline +
+
+ --
Sent by ${object.user_id.name} from ${object.user_id.company_id.name}. View this meeting detail directly in OpenERP. +
+ + + + ]]>