diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml index e13edaf6312..47568f6ab31 100644 --- a/addons/calendar/calendar_data.xml +++ b/addons/calendar/calendar_data.xml @@ -103,122 +103,114 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,

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

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,

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

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- Accept - Decline - View -
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
+ Accept + Decline + View +
+
]]> @@ -234,124 +226,116 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,
-

The date of the meeting has been changed...
- The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,
+

The date of the meeting has been changed...
+ The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- Accept - Decline - View -
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
+ Accept + Decline + View +
+
]]> @@ -367,118 +351,110 @@ - - - ${object.event_id.name} - - - -
-
- ${object.event_id.name} -
-
- Dear ${object.cn} ,
-

That is a reminder for the event below :

-
-
- - - - + +
-
${object.event_id.get_interval(object.event_id.start, 'dayname')}
-
- ${object.event_id.get_interval(object.event_id.start,'day')} -
-
${object.event_id.get_interval(object.event_id.start, 'month')}
-
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
- 		- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- % if object.event_id.location: -
- Where -
- % endif - 		- % if object.event_id.location: -
- : ${object.event_id.location} - (View Map) - -
- % endif -
- % if object.event_id.description : -
- What -
- % endif - 		- % if object.event_id.description : -
- : ${object.event_id.description} -
- % endif -
- % if not object.event_id.allday and object.event_id.duration: -
- Duration -
- % endif - 		- % if not object.event_id.allday and object.event_id.duration: -
- : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} -
- % endif -
-
- Attendees + +
+
+ ${object.event_id.name} +
+
+ Dear ${object.cn} ,
+

That is a reminder for the event below :

+
+
+ + + + - -
+
${object.event_id.get_interval(object.event_id.start, 'dayname')}
+
+ ${object.event_id.get_interval(object.event_id.start,'day')} +
+
${object.event_id.get_interval(object.event_id.start, 'month')}
+
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
+ 		+ + + - - -
+ % if object.event_id.location: +
+ Where
- 		- : - % for attendee in object.event_id.attendee_ids: -
- % if attendee.cn != object.cn: - ${attendee.cn} - % else: - You - % endif - % endfor -
-
-
-
- - + % endif +
+ % if object.event_id.location: +
+ : ${object.event_id.location} + (View Map) + +
+ % endif +
+ % if object.event_id.description : +
+ What +
+ % endif + 		+ % if object.event_id.description : +
+ : ${object.event_id.description} +
+ % endif +
+ % if not object.event_id.allday and object.event_id.duration: +
+ Duration +
+ % endif + 		+ % if not object.event_id.allday and object.event_id.duration: +
+ : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))} +
+ % endif +
+
+ Attendees +
+ 		+ : + % for attendee in object.event_id.attendee_ids: +
+ % if attendee.cn != object.cn: + ${attendee.cn} + % else: + You + % endif + % endfor +
+
+
+
]]>